From: Mario Date: Thu, 27 Nov 2014 03:24:29 +0000 (+1100) Subject: Merge branch 'master' into nyov/instagib-rename X-Git-Tag: xonotic-v0.8.0~136^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=58960b5b45e81dd77b709cff5e3ac23095055854;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into nyov/instagib-rename --- 58960b5b45e81dd77b709cff5e3ac23095055854