From: Mario <zacjardine@y7mail.com>
Date: Fri, 5 Dec 2014 11:02:53 +0000 (+1100)
Subject: Merge branch 'Mario/ctf_fixes'
X-Git-Tag: xonotic-v0.8.0~128
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=aa2023fe1f44cd93902c9a70b06586a67ec2cd77;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/ctf_fixes'
---

aa2023fe1f44cd93902c9a70b06586a67ec2cd77