From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 12 Dec 2010 13:43:25 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/ctsfix'
X-Git-Tag: xonotic-v0.1.0preview~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f1900cecab47b015eeac137dd7f542164862adc;p=xonotic%2Fxonotic-data.pk3dir.git

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

8f1900cecab47b015eeac137dd7f542164862adc