From: Rudolf Polzer Date: Fri, 13 May 2011 15:45:43 +0000 (+0200) Subject: Merge remote branch 'origin/akari/freezetag-fixes' X-Git-Tag: xonotic-v0.5.0~263^2~12 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f09691075c4a61f4ab4b81b4354cff95be9ea26f;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/akari/freezetag-fixes' --- f09691075c4a61f4ab4b81b4354cff95be9ea26f