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

Trivial merge