Merge remote-tracking branch 'chrisjrn/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 12:19:18 +0000 (13:19 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Nov 2012 12:19:18 +0000 (13:19 +0100)

Trivial merge