From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 6 Sep 2010 15:30:02 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/voretemple_updates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bb7892d9612978ac335cfd3c0757400dd4a15912;p=voretournament%2Fvoretournament.git

Merge branch 'master' into mirceakitsune/voretemple_updates
---

bb7892d9612978ac335cfd3c0757400dd4a15912