Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 5 Dec 2013 21:30:04 +0000 (22:30 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 5 Dec 2013 21:30:04 +0000 (22:30 +0100)

Trivial merge