From: mand1nga <mand1nga@xonotic.org>
Date: Tue, 16 Aug 2011 04:15:04 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/bot-assault
X-Git-Tag: xonotic-v0.5.0~122^2^2~4
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=5d2f4a6d42d25232423fa1add7461a8f477abe0f

Merge branch 'master' into mand1nga/bot-assault
---

5d2f4a6d42d25232423fa1add7461a8f477abe0f