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