From: Philipp Dallig Date: Fri, 25 Nov 2016 17:05:51 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3760 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=bcb97f5c772b60e9a86229833b37725e8e470665;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- bcb97f5c772b60e9a86229833b37725e8e470665