Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 23 Jan 2015 16:22:45 +0000 (17:22 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 23 Jan 2015 16:22:45 +0000 (17:22 +0100)

Trivial merge