From: Philipp Dallig Date: Fri, 7 Apr 2017 15:10:15 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3274 X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=fae584c520b27233db8d57e8b8c6f5359c40fbf5;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- fae584c520b27233db8d57e8b8c6f5359c40fbf5