Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Fri, 25 Aug 2017 06:56:48 +0000 (08:56 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Fri, 25 Aug 2017 06:56:48 +0000 (08:56 +0200)

Trivial merge