Merge commit '8ee3415'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 7 Jan 2015 06:30:57 +0000 (07:30 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 7 Jan 2015 06:30:57 +0000 (07:30 +0100)

Trivial merge