From: varac <varacanero@zeromail.org>
Date: Sun, 14 Apr 2013 12:55:15 +0000 (+0200)
Subject: Merge branch 'nadir_issue_4227' into nadir_master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cd87ef7ff8a7af82575e2a3b254e469b2da412f2;p=puppet-apt.git

Merge branch 'nadir_issue_4227' into nadir_master

Conflicts:
	manifests/unattended_upgrades.pp
---

cd87ef7ff8a7af82575e2a3b254e469b2da412f2