Merge remote branch 'refs/remotes/origin/fruitiex/crosshairs_src'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 06:46:55 +0000 (08:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 06:46:55 +0000 (08:46 +0200)

Trivial merge