Merge remote-tracking branch 'origin/morphed/casing'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 30 Aug 2011 19:12:18 +0000 (21:12 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 30 Aug 2011 19:12:18 +0000 (21:12 +0200)

Trivial merge