From: Philipp Dallig Date: Tue, 29 Mar 2016 11:32:27 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5082 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=9b8352806c3ad7c88673e883d24e0d8b33acf1fd;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 9b8352806c3ad7c88673e883d24e0d8b33acf1fd