From: terencehill <piuntn@gmail.com>
Date: Tue, 18 Jun 2013 15:33:00 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/ca_ft_fixes
X-Git-Tag: xonotic-v0.8.0~243^2~1^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=53c0fad35f703c744ffe14a73bf50f96094272c6;p=xonotic%2Fxonotic-data.pk3dir.git

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

53c0fad35f703c744ffe14a73bf50f96094272c6