From: Philipp Dallig Date: Thu, 28 Apr 2016 08:34:29 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4916 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=e5053e3e26ff259403299bc64e9ccfe1d6ef40f1;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- e5053e3e26ff259403299bc64e9ccfe1d6ef40f1