From: gerstenberg Date: Tue, 16 Feb 2016 11:40:13 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5374^2~6 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a35ac93cf235be69d32eb0e0b6464e103557d499;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- a35ac93cf235be69d32eb0e0b6464e103557d499