From: terencehill <piuntn@gmail.com>
Date: Thu, 30 Jan 2014 00:58:16 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/ca_fixes
X-Git-Tag: xonotic-v0.8.0~126^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6080067ca0e4ef0683d2a94ee6543299beca01ed;p=xonotic%2Fxonotic-data.pk3dir.git

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

6080067ca0e4ef0683d2a94ee6543299beca01ed