Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Tue, 11 Apr 2017 12:21:43 +0000 (14:21 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Tue, 11 Apr 2017 12:21:43 +0000 (14:21 +0200)

Trivial merge