From: terencehill Date: Sun, 23 Aug 2015 15:33:36 +0000 (+0200) Subject: Merge branch 'master' into terencehill/bot_fixes X-Git-Tag: xonotic-v0.8.2~1891^2 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=867ce0406b74601b6d74a4ac412ac30063490d88;hp=--cc Merge branch 'master' into terencehill/bot_fixes --- 867ce0406b74601b6d74a4ac412ac30063490d88