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