From: Philipp Dallig Date: Tue, 14 Jun 2016 15:17:34 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4697 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=10758de4dc364972addcd364ca75d0083e7c9ae9;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 10758de4dc364972addcd364ca75d0083e7c9ae9