Merge branch 'master' of git://git.xonotic.org/xonotic/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Tue, 22 Feb 2011 19:09:54 +0000 (20:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 22 Feb 2011 19:09:54 +0000 (20:09 +0100)

Trivial merge