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

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

df4fbc07dacc9c2785e2cbe3f9010c4e07ed10ad