From: Philipp Dallig Date: Fri, 12 Aug 2016 10:20:22 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4315 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=da031d15e0760b729733f7a135ce16f62eedf64f;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- da031d15e0760b729733f7a135ce16f62eedf64f