From: Rudolf Polzer Date: Mon, 17 Jan 2011 09:28:22 +0000 (+0100) Subject: Merge branch 'master' into divVerent/german-translation X-Git-Tag: xonotic-v0.5.0~318^2~77 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95296aec9692be3f48141461ba3eadbe80bb5faf;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/german-translation --- 95296aec9692be3f48141461ba3eadbe80bb5faf