From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Feb 2011 23:25:57 +0000 (+0100)
Subject: Merge remote branch 'immerda/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0b709ed5a7acb5964970e2f49153bd47fc9a7301;p=puppet-common.git

Merge remote branch 'immerda/master'
---

0b709ed5a7acb5964970e2f49153bd47fc9a7301