Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 23 Dec 2013 12:52:15 +0000 (13:52 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 23 Dec 2013 12:52:15 +0000 (13:52 +0100)

Trivial merge