From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 21 May 2011 12:17:22 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/playermodel_draconi
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80f7c13167c909819179fa8bd0b2b7f3ff62889d;p=xonotic%2Fxonotic-data.pk3dir.git

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

80f7c13167c909819179fa8bd0b2b7f3ff62889d