Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 12 Jan 2014 11:55:05 +0000 (12:55 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 12 Jan 2014 11:55:05 +0000 (12:55 +0100)

Trivial merge