diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:24:57 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:24:57 +0100 |
| commit | ee6d13d1e42acca7374aa302a4f9dfa9001d799f (patch) | |
| tree | f7d45d0a313a9fd5794ed11ee47418f53fb07047 /templates/Ubuntu/sources.list.backports.erb | |
| parent | 06a2957f9f0c2b4060709150afa194b98c6995ba (diff) | |
| parent | ac76a5d52df78aec919f08334ca5b140902a9298 (diff) | |
| download | puppet-apt-ee6d13d1e42acca7374aa302a4f9dfa9001d799f.tar.gz puppet-apt-ee6d13d1e42acca7374aa302a4f9dfa9001d799f.tar.bz2 | |
Merge commit 'ac76a5d52df78aec919f08334ca5b140902a9298'
(Starting to merge changes from immerda.)
Conflicts:
manifests/default_sources_list.pp
manifests/init.pp
Diffstat (limited to 'templates/Ubuntu/sources.list.backports.erb')
0 files changed, 0 insertions, 0 deletions