Merge remote branch 'origin/tzork/projetiles'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 14:13:55 +0000 (15:13 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 14:13:55 +0000 (15:13 +0100)

Trivial merge