From: Philipp Dallig Date: Fri, 16 Dec 2016 09:55:25 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3725^2~8^2~5 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=042eb4a9ed4f2c113d4caf22106e04f2c11e4f5f;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 042eb4a9ed4f2c113d4caf22106e04f2c11e4f5f