From: mh <mh@immerda.ch>
Date: Wed, 2 Jan 2013 14:42:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'shared/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7bb36698846f144c14dda46bc8378e67065bc388;p=puppet-concat.git

Merge remote-tracking branch 'shared/master'
---

7bb36698846f144c14dda46bc8378e67065bc388