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

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

ab75e2748bb72b9f9a1c559e6e40313d893e1b9f