From: Philipp Dallig Date: Wed, 9 Mar 2016 12:51:30 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5169 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1fea1a9c030d5abc85352fe4bdc53344368a9a76;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 1fea1a9c030d5abc85352fe4bdc53344368a9a76