Merge remote-tracking branch 'Elbandi/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 14 Oct 2013 23:26:34 +0000 (01:26 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 14 Oct 2013 23:26:34 +0000 (01:26 +0200)

Trivial merge