From: Rudolf Polzer Date: Thu, 26 Jan 2012 11:27:02 +0000 (+0100) Subject: Merge branch 'master' into cbrutail/translation-hu_0.6 X-Git-Tag: xonotic-v0.6.0~48^2~1^2~11^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c87659f91c2d41ca13937434fe79a7111ee4681c;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into cbrutail/translation-hu_0.6 --- c87659f91c2d41ca13937434fe79a7111ee4681c