From: Philipp Dallig Date: Mon, 21 Mar 2016 16:22:09 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5113^2~3 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=ced6ae7755c951a97642dbe738fe57a57659b620;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- ced6ae7755c951a97642dbe738fe57a57659b620