From: varac <varacanero@zeromail.org>
Date: Sun, 3 Mar 2013 08:26:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/origin/master' into nadir_master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e596bfb9306664ab4aef78bc05615904b7c6e7f2;p=puppet-apt.git

Merge remote-tracking branch 'remotes/origin/master' into nadir_master

Conflicts:
	README
	files/50unattended-upgrades
	files/lenny/50unattended-upgrades
	files/squeeze/50unattended-upgrades
	manifests/dist_upgrade.pp
	manifests/init.pp
	manifests/upgrade_package.pp
---

e596bfb9306664ab4aef78bc05615904b7c6e7f2