From: Philipp Dallig Date: Wed, 4 Jan 2017 14:48:32 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3682 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=78ece612f266a487e16e62694e122585ea2d7acf;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 78ece612f266a487e16e62694e122585ea2d7acf