Merge remote-tracking branch 'olebowle/ard'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 27 Oct 2014 00:36:50 +0000 (01:36 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 27 Oct 2014 00:36:50 +0000 (01:36 +0100)

Trivial merge