From: Rudolf Polzer Date: Sun, 23 Jan 2011 18:33:52 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~133 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=1b2c9a2d1c8380ec613fc007e098eb7634204e00 Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 1b2c9a2d1c8380ec613fc007e098eb7634204e00