Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 6 Jan 2014 16:37:20 +0000 (17:37 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 6 Jan 2014 16:37:20 +0000 (17:37 +0100)

Trivial merge