]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorsamuel.bufe <samuel.bufe@publicispixelpark.de>
Fri, 2 Sep 2016 12:25:23 +0000 (14:25 +0200)
committersamuel.bufe <samuel.bufe@publicispixelpark.de>
Fri, 2 Sep 2016 12:25:23 +0000 (14:25 +0200)

Trivial merge