From: Philipp Dallig Date: Tue, 23 Feb 2016 10:01:53 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5321 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a426d7b19018c6a0bb19af981306bf1660d596eb;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- a426d7b19018c6a0bb19af981306bf1660d596eb