From: Philipp Dallig Date: Mon, 15 Feb 2016 15:19:06 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5378 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1e1860dc68fa6b5c23bd2c4a89ce9c3f6590e2cf;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 1e1860dc68fa6b5c23bd2c4a89ce9c3f6590e2cf