From: Sven Marcel Buchholz Date: Thu, 10 Mar 2016 13:27:20 +0000 (+0100) Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera X-Git-Tag: v0.1.0~5155^2 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a82a094ad7bbaa39c6ea72286dea9e3eb29e003e;p=pixelpark%2Fhiera.git Merge branch 'master' of git.pixelpark.com:puppet/hiera --- a82a094ad7bbaa39c6ea72286dea9e3eb29e003e