Merge branch 'master' of /var/cache/git/xonotic/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Mon, 9 Apr 2012 07:44:44 +0000 (09:44 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 9 Apr 2012 07:44:44 +0000 (09:44 +0200)

Trivial merge