From: Philipp Dallig Date: Fri, 17 Mar 2017 15:30:16 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3419 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=5034cf96b09b4272a556ab4603172c04865697ce;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 5034cf96b09b4272a556ab4603172c04865697ce