Merge remote branch 'refs/remotes/origin/diabolik/weaponscalesource'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 16 May 2010 19:05:11 +0000 (21:05 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 16 May 2010 19:05:11 +0000 (21:05 +0200)

Trivial merge