From: Samual <samual@xonotic.org>
Date: Tue, 27 Sep 2011 00:39:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~265
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7e1f5b4e123bfcfcb9f259090b275f4e7aeab30;p=xonotic%2Fxonotic-data.pk3dir.git

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

c7e1f5b4e123bfcfcb9f259090b275f4e7aeab30