From: Philipp Dallig Date: Tue, 10 May 2016 15:21:39 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4880^2 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d855391a0ce22d892ee5f799bd7562ee6068da7c;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- d855391a0ce22d892ee5f799bd7562ee6068da7c