From: Samual <samual@xonotic.org>
Date: Fri, 14 Oct 2011 20:02:59 +0000 (-0400)
Subject: Merge remote branch 'origin/samual/cvar_fixes'
X-Git-Tag: xonotic-v0.6.0~40^2~38^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1de17151f1df7d6f7608575489359f8e0ae4deab;p=xonotic%2Fxonotic-data.pk3dir.git

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

1de17151f1df7d6f7608575489359f8e0ae4deab