From: Samual <samual@xonotic.org>
Date: Sat, 3 Dec 2011 06:34:00 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~197
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=6c447fe29ad1fad63d450c40388079ad1916cd33;p=xonotic%2Fxonotic-data.pk3dir.git

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

6c447fe29ad1fad63d450c40388079ad1916cd33