diff options
| author | mh <mh@immerda.ch> | 2010-10-21 01:59:41 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-10-21 01:59:41 +0200 |
| commit | e2ac1b3d8d1713c81c83a695b776dec1c00d2d47 (patch) | |
| tree | 5ff6553207f4b118562a3be76fc4f7d08638db04 /templates/Ubuntu/sources.list.backports.erb | |
| parent | e19c94dcd20c966143c933e22d5a63f350649b6e (diff) | |
| parent | 4dbcd092817708292de6463777b331c8dbc7e727 (diff) | |
| download | puppet-apt-e2ac1b3d8d1713c81c83a695b776dec1c00d2d47.tar.gz puppet-apt-e2ac1b3d8d1713c81c83a695b776dec1c00d2d47.tar.bz2 | |
Merge remote branch 'lelutin/master'
Integrate no custom preference into our new
way to manage the preferences.
Conflicts:
README
manifests/default_preferences.pp
manifests/init.pp
Diffstat (limited to 'templates/Ubuntu/sources.list.backports.erb')
0 files changed, 0 insertions, 0 deletions