Merge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:31:48 +0000 (10:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:31:48 +0000 (10:31 +0200)

Trivial merge