Merge branch 'master' of ssh://icculus.org/netradiant
authorjal <germangar@gmail.com>
Sun, 11 Jul 2010 10:16:26 +0000 (12:16 +0200)
committerjal <germangar@gmail.com>
Sun, 11 Jul 2010 10:16:26 +0000 (12:16 +0200)

Trivial merge