From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 4 Aug 2011 13:07:45 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/weapon_display
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=055ba200edd85cbe204b5e0bf8f6830f8c85af94;p=voretournament%2Fvoretournament.git

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

055ba200edd85cbe204b5e0bf8f6830f8c85af94