From: Philipp Dallig Date: Fri, 31 Mar 2017 12:31:29 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3345^2~1 X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=e52055560a68e4c660427eb21234f5f79de88df0;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- e52055560a68e4c660427eb21234f5f79de88df0