From: Philipp Dallig Date: Wed, 9 Mar 2016 10:22:07 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5171 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=185fe4a268192e0022188dcb5b8b70b6be7f5892;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 185fe4a268192e0022188dcb5b8b70b6be7f5892