From: Philipp Dallig Date: Tue, 2 Feb 2016 09:25:03 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5426 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=7e07da9b08e08069cf4a011f8277dbf36d7be052;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 7e07da9b08e08069cf4a011f8277dbf36d7be052