From: Mario <zacjardine@y7mail.com>
Date: Fri, 5 Dec 2014 11:29:07 +0000 (+1100)
Subject: Merge branch 'terencehill/ca_fixes_and_more'
X-Git-Tag: xonotic-v0.8.0~126
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4fe173504b622fd89552d8f3ce1c4fd1c91bfcf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/ca_fixes_and_more'
---

d4fe173504b622fd89552d8f3ce1c4fd1c91bfcf