From: Mario <zacjardine@y7mail.com>
Date: Mon, 2 Feb 2015 10:22:27 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/develop'
X-Git-Tag: xonotic-v0.8.1~132
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=61c76972374b56c3df73abc2a71fe665fffc2212;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/develop'
---

61c76972374b56c3df73abc2a71fe665fffc2212