From: terencehill Date: Tue, 1 Sep 2015 09:19:46 +0000 (+0200) Subject: Merge branch 'master' into terencehill/translation_system_improvements_2 X-Git-Tag: xonotic-v0.8.2~1808^2~14 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=749fa0b4d14a84b1dea852b496bbd11f1a631a1f;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/translation_system_improvements_2 --- 749fa0b4d14a84b1dea852b496bbd11f1a631a1f