From: intrigeri <intrigeri@boum.org>
Date: Wed, 15 Dec 2010 21:01:34 +0000 (+0100)
Subject: Merge remote branch 'riseup/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7ffedbad6b55bfc317e5a483da11470d7ce2a861;p=puppet-apt.git

Merge remote branch 'riseup/master'
---

7ffedbad6b55bfc317e5a483da11470d7ce2a861