From: Philipp Dallig Date: Mon, 5 Dec 2016 13:20:30 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3725^2~101 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b44e952db46393474bb36cd40c110b126fb92fa4;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- b44e952db46393474bb36cd40c110b126fb92fa4