From: Mario <zacjardine@y7mail.com>
Date: Sun, 14 Dec 2014 00:17:09 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/master' into mirceakitsune/playermodel_terminus
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e2f2bfbf7320db25a96d9d393e157dccd4ed7b30;p=xonotic%2Fxonotic-data.pk3dir.git

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

e2f2bfbf7320db25a96d9d393e157dccd4ed7b30