From: Rudolf Polzer Date: Wed, 19 Aug 2015 23:31:01 +0000 (+0200) Subject: Merge branch 'maint' (early part before Transifex) X-Git-Tag: xonotic-v0.8.2~2069 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c14f2b067c9ab0b4fb8a5b7805c8679be61f1fe0;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'maint' (early part before Transifex) --- c14f2b067c9ab0b4fb8a5b7805c8679be61f1fe0