From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 27 Aug 2011 14:08:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/terencehill/cvar_desc'
X-Git-Tag: xonotic-v0.5.0~53
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=b3a4b144384dbdd7f9ef01d98b7c3fcd83c5e547;hp=b3a4b144384dbdd7f9ef01d98b7c3fcd83c5e547;p=xonotic%2Fxonotic-data.pk3dir.git

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