From: Philipp Dallig Date: Wed, 9 Mar 2016 15:34:24 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5164 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=66ff2d3d68145e34e88347a1b6dbec6633cfd47a;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 66ff2d3d68145e34e88347a1b6dbec6633cfd47a