From: Philipp Dallig Date: Tue, 19 Jul 2016 12:40:35 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4504 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=aff0f67def997ea82404a9384390d454db1c3bda;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- aff0f67def997ea82404a9384390d454db1c3bda