grim/guifications3

merging

2011-05-16, Gary Kramlich
8e6f170cb062
merging
Authors
=======
Gary Kramlich (grim) <grim@reaperworld.com>
Contributors
============
<insert your name here>
Translators
===========
<insert your name here>
Special Thanks
==============
<insert your name here>