From: Samual <samual@xonotic.org>
Date: Thu, 22 Dec 2011 22:36:41 +0000 (-0500)
Subject: Merge remote branch 'origin/samual/config_updates'
X-Git-Tag: xonotic-v0.6.0~74^2~66^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7ee6d6b8bb89cad86c1498abc590b1b838ee5bf;p=xonotic%2Fxonotic-data.pk3dir.git

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

b7ee6d6b8bb89cad86c1498abc590b1b838ee5bf