Merge remote branch 'refs/remotes/origin/mirceakitsune/pickup_crosshair'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 31 Oct 2010 13:40:16 +0000 (14:40 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 31 Oct 2010 13:40:16 +0000 (14:40 +0100)

Trivial merge