Merge remote branch 'origin/tzork/turrets'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 16 Oct 2010 19:36:52 +0000 (21:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 16 Oct 2010 19:36:52 +0000 (21:36 +0200)

Trivial merge