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