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

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

405ed8bb55aac6155fe25e757bde8666176ee4c7