From: Mario <mario.mario@y7mail.com>
Date: Wed, 8 May 2013 02:11:00 +0000 (+1000)
Subject: Merge branch 'master' into Mario/mute_bot_warnings
X-Git-Tag: xonotic-v0.7.0~54^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68d9a87b4cf6fe824c2fa9a21a284b56b666c522;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/mute_bot_warnings
---

68d9a87b4cf6fe824c2fa9a21a284b56b666c522