From: Peter Meier <peter.meier@immerda.ch>
Date: Wed, 3 Aug 2011 12:27:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'ripienaar/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=185adddae8cbba57891167cef05b94a8b3e25171;p=puppet-concat.git

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

185adddae8cbba57891167cef05b94a8b3e25171