From: Philipp Dallig Date: Tue, 18 Oct 2016 09:52:04 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3964 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=ee17389bad3fc74907a59e35b276da610c08834c;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- ee17389bad3fc74907a59e35b276da610c08834c