Merge branch 'master' of ssh://git.xonotic.org/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Fri, 31 Dec 2010 17:55:14 +0000 (18:55 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 31 Dec 2010 17:55:14 +0000 (18:55 +0100)

Trivial merge