From: Mario <mario@smbclan.net>
Date: Tue, 19 Jul 2016 08:36:50 +0000 (+1000)
Subject: Merge branch 'master' into sev/hud_ctf_update
X-Git-Tag: xonotic-v0.8.2~700^2~11^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c223a54179dcc6b7ce15efcaa13fb777dc0e4e8e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into sev/hud_ctf_update
---

c223a54179dcc6b7ce15efcaa13fb777dc0e4e8e