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