Merge remote branches 'origin/diabolik/exteriorweaponposition', 'origin/diabolik...
authorRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 14:55:31 +0000 (16:55 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 14:55:31 +0000 (16:55 +0200)

Trivial merge