From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 31 Mar 2016 17:50:07 +0000 (-0300)
Subject: Merge remote-tracking branch 'shared/master' into develop
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=refs%2Fheads%2Fdevelop;p=puppet-apt.git

Merge remote-tracking branch 'shared/master' into develop

Conflicts:
	README
	files/Debian/50unattended-upgrades.lenny
	files/Debian/50unattended-upgrades.wheezy
	manifests/init.pp
	manifests/params.pp
	manifests/unattended_upgrades.pp
	templates/Debian/preferences_jessie.erb
	templates/Debian/sources.list.erb
---

b65996f7ae03d2bae118855a3c4d94a3947e556d