From: Mario <zacjardine@y7mail.com>
Date: Thu, 22 Jan 2015 15:35:17 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/master' into mirceakitsune/playermodel_draconi
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6f0b8a91bf021be3117623d1da297e699018dfb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into mirceakitsune/playermodel_draconi
---

a6f0b8a91bf021be3117623d1da297e699018dfb