From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 14 Feb 2011 16:11:19 +0000 (-0200)
Subject: Merge branch 'master' of git://labs.riseup.net/shared-apt
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1203852923594064e61fcfa0e4bf35f72000175d;p=puppet-apt.git

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

Conflicts:
	manifests/init.pp
	templates/sources.list.backports.erb
---

1203852923594064e61fcfa0e4bf35f72000175d