From: Philipp Dallig Date: Fri, 12 Aug 2016 09:31:54 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4317 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=881696891a374d06616a2edb5170551d225df935;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 881696891a374d06616a2edb5170551d225df935