Merge branch 'master' of ssh://git.xonotic.org/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 09:12:14 +0000 (11:12 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 09:12:14 +0000 (11:12 +0200)

Trivial merge