From: Philipp Dallig Date: Wed, 17 Aug 2016 11:40:44 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4273 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a4d7b562cba42137410b40aca939df2992c9c9a1;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- a4d7b562cba42137410b40aca939df2992c9c9a1