From: Philipp Dallig Date: Tue, 7 Mar 2017 13:53:04 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3485 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a3d724094dbc41265ff7b34be7100dc39d4cff33;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- a3d724094dbc41265ff7b34be7100dc39d4cff33