From: FruitieX <fruitiex@gmail.com>
Date: Thu, 9 Dec 2010 21:19:10 +0000 (+0200)
Subject: Merge branch 'master' into fruitiex/ctsfix
X-Git-Tag: xonotic-v0.1.0preview~51^2~20^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4807d95dd32464be05ee8d6bfcb815550524f949;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into fruitiex/ctsfix
---

4807d95dd32464be05ee8d6bfcb815550524f949