From: Philipp Dallig Date: Thu, 5 Jan 2017 15:38:14 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3661 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f02424a4be02948de1b9797f03cf7c103ef01145;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- f02424a4be02948de1b9797f03cf7c103ef01145