Merge remote branch 'origin/morphed/mine'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:28:25 +0000 (08:28 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:28:25 +0000 (08:28 +0100)

Trivial merge