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

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

b2f9d91ff4f9da0c9592b89f7e38cc6f2beb188d