From: Samual <samual@xonotic.org>
Date: Wed, 4 Jan 2012 16:48:12 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~30^2~46^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9449ca0d4a61f496433f046969e722aefc02477;p=xonotic%2Fxonotic.git

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

d9449ca0d4a61f496433f046969e722aefc02477