From: Rudolf Polzer Date: Sun, 16 Jan 2011 20:25:07 +0000 (+0100) Subject: Merge branch 'master' into divVerent/gettextizing-the-source X-Git-Tag: xonotic-v0.5.0~318^2~104 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=705a214cccc6bfb5c5cd04443f9898caf7bbe6b7 Merge branch 'master' into divVerent/gettextizing-the-source --- 705a214cccc6bfb5c5cd04443f9898caf7bbe6b7