From: Philipp Dallig Date: Mon, 18 Jul 2016 13:19:46 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4519 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b0dcd59deca4ddf0388a5834e16629db08cbb9db;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- b0dcd59deca4ddf0388a5834e16629db08cbb9db