From: samuel.bufe Date: Wed, 24 Feb 2016 09:51:44 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5311^2 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=81a4e7babb33bd3c9fd9176d11e14cc7369373ab;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 81a4e7babb33bd3c9fd9176d11e14cc7369373ab