From: Peter Meier <peter.meier@immerda.ch>
Date: Thu, 23 Jun 2011 08:17:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'tim/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cfda8dd6ac58435d017fda6311b3c2394297d09f;p=puppet-concat.git

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

cfda8dd6ac58435d017fda6311b3c2394297d09f