From: terencehill Date: Sat, 5 Sep 2015 12:10:22 +0000 (+0200) Subject: Merge branch 'master' into terencehill/translation_system_improvements_2 X-Git-Tag: xonotic-v0.8.2~1918^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=18302817d7f0cb0ba74398200da5e400ffc1b9a4;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/translation_system_improvements_2 --- 18302817d7f0cb0ba74398200da5e400ffc1b9a4