From: Philipp Dallig Date: Thu, 7 Apr 2016 15:13:12 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5034 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=2237bb40e51fe7dbc9eb7164fd8949423277e786;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 2237bb40e51fe7dbc9eb7164fd8949423277e786