From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 11:19:00 +0000 (+1100)
Subject: Merge branch 'master' into Mario/gametype_votes
X-Git-Tag: xonotic-v0.8.0~168^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be5a823f20ae87084f1e4f5ea9cfd69577bc7ba0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/gametype_votes
---

be5a823f20ae87084f1e4f5ea9cfd69577bc7ba0