Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 3 Jan 2014 12:10:00 +0000 (13:10 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 3 Jan 2014 12:10:00 +0000 (13:10 +0100)

Trivial merge