From: intrigeri <intrigeri@boum.org>
Date: Thu, 16 Dec 2010 12:58:10 +0000 (+0100)
Subject: Merge remote branch 'immerda/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5d7667b8d00cc3fc6cfa75a0413076db1dd0cff8;p=puppet-common.git

Merge remote branch 'immerda/master'
---

5d7667b8d00cc3fc6cfa75a0413076db1dd0cff8