From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 3 Jan 2012 19:45:35 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/playermodel_draconi
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ce7d6f9e087be8eb4251417299dde7652f7fb34;p=xonotic%2Fxonotic-data.pk3dir.git

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

6ce7d6f9e087be8eb4251417299dde7652f7fb34