Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Wed, 1 Mar 2017 13:15:32 +0000 (14:15 +0100)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Wed, 1 Mar 2017 13:15:32 +0000 (14:15 +0100)

Trivial merge