From: Samual <samual@xonotic.org>
Date: Tue, 20 Dec 2011 20:11:44 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~90
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4a7aaab8442dbbd667628adc4f9052ef939db77c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/updatecommands
---

4a7aaab8442dbbd667628adc4f9052ef939db77c