From: Philipp Dallig Date: Tue, 22 Mar 2016 08:44:51 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5111^2~3 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d520f1927499f89c2aeba4c5f16bca575f7e5f03;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- d520f1927499f89c2aeba4c5f16bca575f7e5f03