From: Samual <samual@xonotic.org>
Date: Wed, 4 Jan 2012 17:15:19 +0000 (-0500)
Subject: Merge remote branch 'origin/samual/updatecommands'
X-Git-Tag: xonotic-v0.6.0~30^2~46
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=7c142c574a0121814983d17e25b716ddbb0f57a3;hp=7c142c574a0121814983d17e25b716ddbb0f57a3;p=xonotic%2Fxonotic.git

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