From: Philipp Dallig Date: Wed, 2 Nov 2016 13:09:58 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3873 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=e33b7f3eab8da311d077ae29fac5c32c4ce30f72;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- e33b7f3eab8da311d077ae29fac5c32c4ce30f72