]> gitweb.fluxo.info Git - puppet-apt.git/commit
Merge branch 'nadir_issue_4227' into nadir_master
authorvarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 12:55:15 +0000 (14:55 +0200)
committervarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 12:55:15 +0000 (14:55 +0200)
commitcd87ef7ff8a7af82575e2a3b254e469b2da412f2
tree5c92e64727696c3884babe4615172338a78fc742
parentdcbf50776f4cb6fc2e1e2a9065e1a7308025d5b9
parent355372f31cc93ea975c89dc2977d942ee048fe9d
Merge branch 'nadir_issue_4227' into nadir_master

Conflicts:
manifests/unattended_upgrades.pp
manifests/unattended_upgrades.pp