Merge branch 'master' of ssh://git.xonotic.org/netradiant
authorRudolf Polzer <divVerent@alientrap.org>
Mon, 27 Sep 2010 07:58:57 +0000 (09:58 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Mon, 27 Sep 2010 07:58:57 +0000 (09:58 +0200)

Trivial merge