Merge branch 'master' of ssh://icculus.org/netradiant
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 23 Feb 2011 13:19:58 +0000 (14:19 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 23 Feb 2011 13:19:58 +0000 (14:19 +0100)

Trivial merge