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)
commitf24a5a2faab20e13c3a9f752f3d41fe66212d2c6
treef2ab72c4e6de6dd988883e084c0cd39f35ef12ce
parentecfe623422f61df886b83e6eae98a0e4a297802e
parentbfd91588f3fab0d5a14726810c186e5ec2fdd0f4
Merge remote-tracking branch 'olebowle/ard'