From: Philipp Dallig Date: Tue, 24 May 2016 13:53:38 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4796 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f1e48634a198b38a637c257d1fbe49dc45b0d90a;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- f1e48634a198b38a637c257d1fbe49dc45b0d90a