Merge branch 'master' into mirceakitsune/voretournament-campaign
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 15 Sep 2010 13:39:01 +0000 (16:39 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 15 Sep 2010 13:39:01 +0000 (16:39 +0300)

Trivial merge