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)
commitd15b126bf51d20b47e34893a0049bf810e340c50
tree8c444e09937a3f87f8eb245500b1af4e45eb3d29
parenteaa9ffa4bb207201d60f013fc4c14ada3de3452d
parentffac35c5fde607ff0e475148b1ef713975dc4157
Merge remote branch 'refs/remotes/origin/diabolik/rifleelectrofix'