From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 10 May 2014 15:51:10 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/playermodel_draconi
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=13267751d4d011d2d6f7e45a76a921257dd17dc2;p=xonotic%2Fxonotic-data.pk3dir.git

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

13267751d4d011d2d6f7e45a76a921257dd17dc2