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

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

537c7579e9b7212ddbdf2ac32476227d841ffca9