Merge branch 'master' into mirceakitsune/shotgun_cannon
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 26 Nov 2011 00:17:16 +0000 (02:17 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 26 Nov 2011 00:17:16 +0000 (02:17 +0200)

Trivial merge