From: Rudolf Polzer Date: Sun, 16 Jan 2011 21:53:35 +0000 (+0100) Subject: Merge branch 'master' into divVerent/gettextizing-the-source X-Git-Tag: xonotic-v0.5.0~318^2~88 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5eafbda9690a04118ae0e1fac02b5e4cfacf7cd1;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/gettextizing-the-source --- 5eafbda9690a04118ae0e1fac02b5e4cfacf7cd1