From: Philipp Dallig Date: Thu, 3 Mar 2016 13:45:52 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5224 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=9200141c65959894636fb34c46d594474c3acefc;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 9200141c65959894636fb34c46d594474c3acefc