From: Samual <samual@xonotic.org>
Date: Wed, 4 Jan 2012 17:12:06 +0000 (-0500)
Subject: Merge remote branch 'origin/samual/updatecommands'
X-Git-Tag: xonotic-v0.6.0~188^2~28
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=0d98d1fe4a18429be415db1c8d98ea44580509d7;p=xonotic%2Fxonotic-data.pk3dir.git

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

0d98d1fe4a18429be415db1c8d98ea44580509d7