From: terencehill <piuntn@gmail.com>
Date: Thu, 5 Jan 2012 20:15:34 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/arena_and_ca_fixes
X-Git-Tag: xonotic-v0.6.0~42^2~7^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9f31b2438f27e46e900e4a9afe47fec5fcace088;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/arena_and_ca_fixes
---

9f31b2438f27e46e900e4a9afe47fec5fcace088