From: Matthias Krüger Date: Fri, 11 Oct 2013 15:41:52 +0000 (+0200) Subject: Merge branch 'master' into matthiaskrgr/hudsetup X-Git-Tag: xonotic-v0.8.1~16^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3de9bbb627ef1db359d5b80d2becf131840d4903;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into matthiaskrgr/hudsetup --- 3de9bbb627ef1db359d5b80d2becf131840d4903