From: Mario <zacjardine@y7mail.com>
Date: Thu, 22 Jan 2015 15:34:35 +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=61a878e2040a4adedd5bc96ab3542d459bc2e216;p=xonotic%2Fxonotic-data.pk3dir.git

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

61a878e2040a4adedd5bc96ab3542d459bc2e216