From: Philipp Dallig Date: Mon, 8 Feb 2016 09:07:56 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5411^2~8^2 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=fc2629d664696aa4a0061c5187e5d2fac8241814;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- fc2629d664696aa4a0061c5187e5d2fac8241814