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