]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
authorgerstenberg <gerstenberg@pixelpark.com>
Tue, 16 Feb 2016 13:05:32 +0000 (14:05 +0100)
committergerstenberg <gerstenberg@pixelpark.com>
Tue, 16 Feb 2016 13:05:32 +0000 (14:05 +0100)

Trivial merge