Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 17 Dec 2012 19:21:41 +0000 (20:21 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 17 Dec 2012 19:21:41 +0000 (20:21 +0100)

Trivial merge