From: Philipp Dallig Date: Tue, 21 Mar 2017 11:33:08 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3413^2~17 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f7996332d5c651a9e1906a1562677db973cf6c2d;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- f7996332d5c651a9e1906a1562677db973cf6c2d