From: Rudolf Polzer Date: Tue, 8 Mar 2011 20:56:52 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~122 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e654d98b21fff82ee94301f91d9a787e9d1e9bd4;p=xonotic%2Fxonotic.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- e654d98b21fff82ee94301f91d9a787e9d1e9bd4