From: Philipp Dallig Date: Thu, 5 Jan 2017 12:21:20 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3668 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4689896c2f31c28d08ecd3db869a1d29113eaf29;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 4689896c2f31c28d08ecd3db869a1d29113eaf29