From: Philipp Dallig Date: Wed, 2 Mar 2016 09:41:06 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5259 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4bac50c35ad0139c38d4969c11da1725d8dfc296;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 4bac50c35ad0139c38d4969c11da1725d8dfc296