]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of git.pixelpark.com:puppet/hiera
authorsamuel.bufe <samuel.bufe@publicispixelpark.de>
Tue, 9 Aug 2016 14:19:50 +0000 (16:19 +0200)
committersamuel.bufe <samuel.bufe@publicispixelpark.de>
Tue, 9 Aug 2016 14:19:50 +0000 (16:19 +0200)

Trivial merge