From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 20 May 2013 21:08:15 +0000 (-0300)
Subject: Merge branch 'master' of ssh://labs.riseup.net/shared-apt
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7c548c9878a5e0cecca771a6b7a739af98c21f4e;p=puppet-apt.git

Merge branch 'master' of ssh://labs.riseup.net/shared-apt

Conflicts:
	manifests/init.pp
---

7c548c9878a5e0cecca771a6b7a739af98c21f4e