Merge remote branch 'origin/parasti/weaponprio'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 12 May 2010 16:35:35 +0000 (18:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 12 May 2010 16:35:35 +0000 (18:35 +0200)

Trivial merge