Merge remote-tracking branch 'hurda/patch-1'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 22 Mar 2014 13:21:04 +0000 (14:21 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 22 Mar 2014 13:21:04 +0000 (14:21 +0100)

Trivial merge