Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Mon, 16 Oct 2017 13:54:30 +0000 (15:54 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Mon, 16 Oct 2017 13:54:30 +0000 (15:54 +0200)

Trivial merge