Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Thu, 19 Oct 2017 13:29:00 +0000 (15:29 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Thu, 19 Oct 2017 13:29:00 +0000 (15:29 +0200)

Trivial merge