Merge remote branch 'refs/remotes/origin/diabolik/rifleelectrofix'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 2 Jul 2010 08:39:12 +0000 (10:39 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 2 Jul 2010 08:39:12 +0000 (10:39 +0200)

Trivial merge