From: Rudolf Polzer Date: Mon, 7 Nov 2011 12:53:46 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~69 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=fe3038f654ba826f19bf085d81ea767a98c8e6bf Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- fe3038f654ba826f19bf085d81ea767a98c8e6bf