From: intrigeri <intrigeri@boum.org>
Date: Sat, 11 Dec 2010 08:39:27 +0000 (+0100)
Subject: Merge remote branch 'riseup/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1cf642b3a87399c165e9e66399ab92694b27ee43;p=puppet-apt.git

Merge remote branch 'riseup/master'
---

1cf642b3a87399c165e9e66399ab92694b27ee43