From: Philipp Dallig Date: Mon, 9 Jan 2017 13:16:34 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3648 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=9533f6a22f7201dd297b579c6a02b5a232817f57;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 9533f6a22f7201dd297b579c6a02b5a232817f57