From: Philipp Dallig Date: Wed, 8 Jun 2016 16:26:21 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4712^2~24 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=cec0461bff8afb9136172e9384007faefa77b526;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- cec0461bff8afb9136172e9384007faefa77b526