Merge remote branch 'origin/savagex/glowplant-warpzonefix'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 30 Oct 2010 14:41:19 +0000 (16:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 30 Oct 2010 14:41:19 +0000 (16:41 +0200)

Trivial merge