From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 30 Aug 2011 19:12:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/morphed/casing'
X-Git-Tag: xonotic-v0.5.0~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6eeab865ebe5dd796bde14c88a1d562114ef20ed;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/morphed/casing'
---

6eeab865ebe5dd796bde14c88a1d562114ef20ed