From: Samual Lenks <samual@xonotic.org>
Date: Tue, 28 May 2013 20:21:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/terencehill/cmd_fixes'
X-Git-Tag: xonotic-v0.7.0~39
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ab9d7c6bef3e848b1d2fed20674a1a8aabd15e4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/cmd_fixes'
---

0ab9d7c6bef3e848b1d2fed20674a1a8aabd15e4