Merge branch 'master' into mirceakitsune/glowmod_weapons
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 10 May 2011 23:22:50 +0000 (02:22 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 10 May 2011 23:22:50 +0000 (02:22 +0300)

Trivial merge