From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 19 Oct 2011 21:16:57 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/playermodel_draconi
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=afd030a1dff7501dc1ab9584a39757018d0016ca;p=xonotic%2Fxonotic-data.pk3dir.git

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

afd030a1dff7501dc1ab9584a39757018d0016ca