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

Merge remote branch 'immerda/master'
---

f61a347d84d0b47f0e32cd4746c77e61c44c4ac4