From: Mario <mario.mario@y7mail.com>
Date: Fri, 10 May 2013 04:56:09 +0000 (+1000)
Subject: Merge branch 'master' into Mario/mute_bot_warnings
X-Git-Tag: xonotic-v0.7.0~54^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b85cb7338795fe08f22f5d833b44e74008eb9918;p=xonotic%2Fxonotic-data.pk3dir.git

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

b85cb7338795fe08f22f5d833b44e74008eb9918