From: Samual <samual@xonotic.org>
Date: Sun, 1 Jan 2012 19:44:44 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~30^2~46^2~1
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=a39370ebba15e56b74b1a4a93ef0cd5abb5e84f3;p=xonotic%2Fxonotic.git

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

a39370ebba15e56b74b1a4a93ef0cd5abb5e84f3