From: Rudolf Polzer Date: Thu, 8 Mar 2012 14:37:14 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~2 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=6feed6f3196d42a3d649e1a6012c15a7c98f911a Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 6feed6f3196d42a3d649e1a6012c15a7c98f911a