Merge remote branch 'origin/diabolik/weaponscale'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 19 May 2010 13:44:52 +0000 (15:44 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 19 May 2010 13:44:52 +0000 (15:44 +0200)

Trivial merge