From: Philipp Dallig Date: Tue, 9 Aug 2016 13:08:54 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4342^2~3 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f9db4b52305dec29b471995585eebd0dc965765c;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- f9db4b52305dec29b471995585eebd0dc965765c