From: Philipp Dallig Date: Mon, 10 Oct 2016 09:26:48 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4015 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=ca6218d2c8874152de977f193f602319cc1935d4;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- ca6218d2c8874152de977f193f602319cc1935d4