Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 30 Dec 2014 18:41:04 +0000 (19:41 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 30 Dec 2014 18:41:04 +0000 (19:41 +0100)

Trivial merge