]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorThomas Kotschok <thomas.kotschok@sol10.pixelpark.com>
Thu, 19 Jan 2017 12:32:25 +0000 (13:32 +0100)
committerThomas Kotschok <thomas.kotschok@sol10.pixelpark.com>
Thu, 19 Jan 2017 12:32:25 +0000 (13:32 +0100)

Trivial merge