Merge remote-tracking branch 'glisignoli/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 18 Feb 2013 17:47:35 +0000 (18:47 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 18 Feb 2013 17:47:35 +0000 (18:47 +0100)

Trivial merge