Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 10 Jan 2015 19:06:01 +0000 (20:06 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 10 Jan 2015 19:06:01 +0000 (20:06 +0100)

Trivial merge