Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorAndre Schmelzer <andre.schmelzer@pixelpark.com>
Thu, 20 Apr 2017 12:07:47 +0000 (14:07 +0200)
committerAndre Schmelzer <andre.schmelzer@pixelpark.com>
Thu, 20 Apr 2017 12:07:47 +0000 (14:07 +0200)

Trivial merge