From: FruitieX <fruitiex@gmail.com>
Date: Fri, 10 Dec 2010 22:36:31 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/ctsfix' into fruitiex/ctsfix
X-Git-Tag: xonotic-v0.1.0preview~51^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=960db199ba59b839a5043aa9ee8e801b8ceeb115;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/ctsfix' into fruitiex/ctsfix
---

960db199ba59b839a5043aa9ee8e801b8ceeb115