From: Philipp Dallig Date: Fri, 1 Jul 2016 08:03:48 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4611 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=743ea0d8396fe55c9497058af518ab3c45801601;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 743ea0d8396fe55c9497058af518ab3c45801601