From: Philipp Dallig Date: Thu, 3 Mar 2016 13:07:02 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5226 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=c4b8227f6deed335adcf098626dfbf34df5482e0;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- c4b8227f6deed335adcf098626dfbf34df5482e0