From: Samual <samual@xonotic.org>
Date: Sat, 24 Dec 2011 15:52:23 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~82
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e957e97bcf2f9c6b773d9e1f6cf78041f538500;p=xonotic%2Fxonotic-data.pk3dir.git

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

7e957e97bcf2f9c6b773d9e1f6cf78041f538500