Merge remote branch 'origin/tzork/nexballarena'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:20:41 +0000 (15:20 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:20:41 +0000 (15:20 +0100)

Trivial merge