From: mand1nga Date: Thu, 21 Apr 2011 23:35:14 +0000 (-0300) Subject: Merge branch 'master' into mand1nga/fix-bot-wandering X-Git-Tag: xonotic-v0.5.0~264^2~28^2~1^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cd62ff7ea2fd1a62e8c3b903eb06a953016178cd;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mand1nga/fix-bot-wandering --- cd62ff7ea2fd1a62e8c3b903eb06a953016178cd