From: Samual <samual@xonotic.org>
Date: Fri, 16 Dec 2011 12:56:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~137
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=459d6603efe1acff27f2b78d6d144e5a8a005c41;p=xonotic%2Fxonotic-data.pk3dir.git

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

459d6603efe1acff27f2b78d6d144e5a8a005c41