From: Severin Meyer Date: Thu, 9 Jul 2015 08:52:25 +0000 (+0200) Subject: Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3 X-Git-Tag: xonotic-v0.8.1~5^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1fcbaeaaa02677e4f0e04d946064645eee651f76;p=xonotic%2Fxonotic.git Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3 --- 1fcbaeaaa02677e4f0e04d946064645eee651f76