From: Samual <samual@xonotic.org>
Date: Sun, 26 Feb 2012 01:16:36 +0000 (-0500)
Subject: Merge remote branch 'origin/terencehill/arena_and_ca_fixes'
X-Git-Tag: xonotic-v0.6.0~42^2~7
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=87d4a81433ca7dbd761782f9b4b235976c7cdae5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/arena_and_ca_fixes'
---

87d4a81433ca7dbd761782f9b4b235976c7cdae5