From: sambufe <samuel.bufe@publicispixelpark.de>
Date: Fri, 9 Dec 2016 15:07:12 +0000 (+0100)
Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera
X-Git-Tag: v0.1.0~3725^2~60^2~2^2~2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=cc9f85ec37557df981720f4388f36d11d534ab06;p=pixelpark%2Fhiera.git

Merge branch 'master' of git.pixelpark.com:puppet/hiera
---

cc9f85ec37557df981720f4388f36d11d534ab06