]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
authorsamuel.bufe <samuel.bufe@publicispixelpark.de>
Mon, 15 Feb 2016 14:50:45 +0000 (15:50 +0100)
committersamuel.bufe <samuel.bufe@publicispixelpark.de>
Mon, 15 Feb 2016 14:50:45 +0000 (15:50 +0100)

Trivial merge