From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 4 Aug 2011 10:09:30 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/weapon_display
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a2c472881eba03e33cb744304e6e413d2f10ae3a;p=voretournament%2Fvoretournament.git

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

a2c472881eba03e33cb744304e6e413d2f10ae3a