Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 14 Oct 2013 14:07:53 +0000 (16:07 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 14 Oct 2013 14:07:53 +0000 (16:07 +0200)

Trivial merge