From: Mario <mario@smbclan.net>
Date: Tue, 14 Jun 2016 18:34:27 +0000 (+1000)
Subject: Merge branch 'master' into mirceakitsune/playermodel_terminus
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmirceakitsune%2Fplayermodel_terminus;p=xonotic%2Fxonotic-data.pk3dir.git

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

591f78d376c2c2b53fb434ab4d47904608de083e