Merge remote-tracking branch 'yan12125/IE_camdemy'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 12 Feb 2015 07:44:39 +0000 (08:44 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 12 Feb 2015 07:44:39 +0000 (08:44 +0100)

Trivial merge