From: Samual Lenks <samual@xonotic.org>
Date: Fri, 31 May 2013 15:29:12 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/updatecommands'
X-Git-Tag: xonotic-v0.7.0~31
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f85ba46152a91059e9e5cce2856d10cf237cf2eb;p=xonotic%2Fxonotic-data.pk3dir.git

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

f85ba46152a91059e9e5cce2856d10cf237cf2eb