From: Philipp Dallig Date: Thu, 6 Oct 2016 10:26:24 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4037 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=428d7532225f5033755a2080a872ebb97100ba0e;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 428d7532225f5033755a2080a872ebb97100ba0e