From: Rudolf Polzer Date: Sun, 23 Jun 2013 16:21:23 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.8.0~103^2 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=100c8c4a3327809ed6c999d0dcbf226545883229;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 100c8c4a3327809ed6c999d0dcbf226545883229