From: intrigeri <intrigeri@boum.org>
Date: Mon, 13 Dec 2010 08:54:37 +0000 (+0100)
Subject: Merge remote branch 'riseup/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4195a917733bc535d4312e3fe637d6da4c72c105;p=puppet-apt.git

Merge remote branch 'riseup/master'
---

4195a917733bc535d4312e3fe637d6da4c72c105