Merge branch 'master' of ssh://icculus.org/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Thu, 14 Oct 2010 08:07:39 +0000 (10:07 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 14 Oct 2010 08:07:39 +0000 (10:07 +0200)

Trivial merge