Merge branch 'master' into mirceakitsune/voretournament-campaign
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 13 Sep 2010 23:35:50 +0000 (02:35 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 13 Sep 2010 23:35:50 +0000 (02:35 +0300)

Trivial merge