From: Thomas Heller <thomas.heller@pixelpark.com>
Date: Mon, 30 May 2016 14:22:37 +0000 (+0200)
Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera
X-Git-Tag: v0.1.0~4760
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a0bd8cc5baefa280f27fcff41094a12737aa43b7;p=pixelpark%2Fhiera.git

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

a0bd8cc5baefa280f27fcff41094a12737aa43b7