From: Philipp Dallig Date: Thu, 18 Feb 2016 16:36:53 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5347 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=eb11833a5f8d5474263f1b22fddd2f327274f792;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- eb11833a5f8d5474263f1b22fddd2f327274f792