From: Rudolf Polzer Date: Mon, 5 Sep 2011 11:09:24 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0^0 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=5b4307c6a17aac239095030c527fbc76f1a0cf23 Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 5b4307c6a17aac239095030c527fbc76f1a0cf23