From: Martin Taibr Date: Mon, 26 Feb 2018 12:15:02 +0000 (+0100) Subject: Merge branch 'master' into marin-t/contributing X-Git-Tag: xonotic-v0.8.5~179^2~2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=9b7ad47ecb344eb39c653b91d6a4582cac243bf4 Merge branch 'master' into marin-t/contributing --- 9b7ad47ecb344eb39c653b91d6a4582cac243bf4