From: Philipp Dallig Date: Tue, 6 Dec 2016 13:47:59 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3725^2~86 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a265e0a9e1fe2dbc0cb17e05574d2337115c140b;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- a265e0a9e1fe2dbc0cb17e05574d2337115c140b