From: Philipp Dallig Date: Fri, 1 Apr 2016 09:58:41 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5065 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d7bd51b2422cc8eedbe50ee16afea18f897895a6;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- d7bd51b2422cc8eedbe50ee16afea18f897895a6