diff options
| author | varac <varacanero@zeromail.org> | 2013-04-14 14:55:15 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-04-14 14:55:15 +0200 |
| commit | cd87ef7ff8a7af82575e2a3b254e469b2da412f2 (patch) | |
| tree | 5c92e64727696c3884babe4615172338a78fc742 /manifests/preferences.pp | |
| parent | dcbf50776f4cb6fc2e1e2a9065e1a7308025d5b9 (diff) | |
| parent | 355372f31cc93ea975c89dc2977d942ee048fe9d (diff) | |
| download | puppet-apt-cd87ef7ff8a7af82575e2a3b254e469b2da412f2.tar.gz puppet-apt-cd87ef7ff8a7af82575e2a3b254e469b2da412f2.tar.bz2 | |
Merge branch 'nadir_issue_4227' into nadir_master
Conflicts:
manifests/unattended_upgrades.pp
Diffstat (limited to 'manifests/preferences.pp')
0 files changed, 0 insertions, 0 deletions