From: Rudolf Polzer Date: Sat, 29 Jan 2011 22:06:38 +0000 (+0100) Subject: Merge remote branch 'origin/terencehill/freezetag_fix' X-Git-Tag: xonotic-v0.5.0~316^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49a1b0a79699721877d9630fc598574bb0ac91b2;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/terencehill/freezetag_fix' --- 49a1b0a79699721877d9630fc598574bb0ac91b2