Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Thu, 1 Jun 2017 14:22:47 +0000 (16:22 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Thu, 1 Jun 2017 14:22:47 +0000 (16:22 +0200)

Trivial merge