From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 17 Nov 2011 13:50:02 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/weapon_display
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1383ce28153c75886cd6358b29a86065131ad943;p=voretournament%2Fvoretournament.git

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

1383ce28153c75886cd6358b29a86065131ad943