Merge branch 'master' of ssh://git.xonotic.org/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Fri, 30 Jul 2010 13:47:54 +0000 (15:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 30 Jul 2010 13:47:54 +0000 (15:47 +0200)

Trivial merge