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