From: Rudolf Polzer Date: Sun, 14 Nov 2010 16:16:57 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~57 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5da4b1144b28443b45ac68a73d77be8345046795;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 5da4b1144b28443b45ac68a73d77be8345046795