From: Philipp Dallig Date: Tue, 23 Feb 2016 12:48:30 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5318 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a8d1527b56d10eba161697420909b06fb0b839e4;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- a8d1527b56d10eba161697420909b06fb0b839e4