From: Philipp Dallig Date: Thu, 9 Jun 2016 08:30:41 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4712^2~20 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=c65b01db534b2845a56687e61b0980819ac8c1d2;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- c65b01db534b2845a56687e61b0980819ac8c1d2