From: Philipp Dallig Date: Fri, 24 Jun 2016 13:51:08 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4639 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=0fcf90e19644c8d3e8fc0e02958d31db48cda4a0;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 0fcf90e19644c8d3e8fc0e02958d31db48cda4a0