From: Philipp Dallig Date: Fri, 18 Mar 2016 10:50:32 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5136 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6e3ce292840ba2f9da6bfdcf8876ffce53f7deea;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 6e3ce292840ba2f9da6bfdcf8876ffce53f7deea