From: Rudolf Polzer Date: Thu, 26 Jan 2012 16:15:49 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~30^2~20 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=74fd61ca4ce1a8c8e4eab3b15921ce32a3f058d3;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 74fd61ca4ce1a8c8e4eab3b15921ce32a3f058d3