From: Philipp Dallig Date: Mon, 15 Aug 2016 13:53:37 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4294 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=a870bf03575152a1ce9294a3bded40cadb2df6b5;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- a870bf03575152a1ce9294a3bded40cadb2df6b5