]> gitweb.fluxo.info Git - puppet-apt.git/commit
Merge remote-tracking branch 'remotes/origin/master' into nadir_master
authorvarac <varacanero@zeromail.org>
Sun, 3 Mar 2013 08:26:49 +0000 (09:26 +0100)
committervarac <varacanero@zeromail.org>
Sun, 3 Mar 2013 08:26:49 +0000 (09:26 +0100)
commite596bfb9306664ab4aef78bc05615904b7c6e7f2
treed9759fedf3bdfdb4a4cd3aac1e3747abbeaacbd3
parent08b066db441375d1613d131767cb1c5bdd3bb60b
parentd51e2af9d452731f63b2fe16391e9cd2ff9d640f
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