From: tobias.kostyra Date: Fri, 16 Dec 2016 17:19:23 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3725 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=9147e81b38388b87849fca6567754047bb25e7c1;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 9147e81b38388b87849fca6567754047bb25e7c1