From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 13 May 2012 09:25:15 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/playermodel_draconi
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=758880af0044dd7a47009b774bb5dea0101f19b7;p=xonotic%2Fxonotic-data.pk3dir.git

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

758880af0044dd7a47009b774bb5dea0101f19b7