From: Philipp Dallig Date: Mon, 20 Jun 2016 09:44:01 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4662 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=04f7989337126cbd134d3de17858e9bda5f4715c;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 04f7989337126cbd134d3de17858e9bda5f4715c