From: Philipp Dallig Date: Fri, 18 Nov 2016 15:00:13 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3794 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6c9e2de24f51e2281ba188d000e09bafb4ebf893;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 6c9e2de24f51e2281ba188d000e09bafb4ebf893