From: Samual <samual@xonotic.org>
Date: Mon, 26 Dec 2011 03:21:20 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~30^2~46^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49a45eeff26ca019be0b989ca4f4e525ee9bc05a;p=xonotic%2Fxonotic.git

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

49a45eeff26ca019be0b989ca4f4e525ee9bc05a