From: Philipp Dallig Date: Wed, 2 Mar 2016 13:07:11 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5253 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=8759e1e74d9434e49ce4ed14f1fb0f93166663f0;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 8759e1e74d9434e49ce4ed14f1fb0f93166663f0