From: Philipp Dallig Date: Thu, 15 Dec 2016 09:03:46 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3725^2~22 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=18eb69b74b7a93dccb9c7ac1b52df6a8973bf94a;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 18eb69b74b7a93dccb9c7ac1b52df6a8973bf94a