diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 17:03:57 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 17:03:57 +0100 |
| commit | 10c7939f65ae8e2f771d83d54c4ba56108bc509e (patch) | |
| tree | 4c66514e6adfece27e5111d1e296009e94405c6f /files/50unattended-upgrades | |
| parent | 3de76e7b05224b9696a75908b0a4259349e20823 (diff) | |
| parent | 5d54dfdd88d1e87681b317db16b20ad20b8c88f7 (diff) | |
Merge remote branch 'immerda/master'.
Conflicts:
README
files/preferences
templates/Debian/sources.list.deb-src.erb
templates/Debian/sources.list.volatile.erb
templates/Ubuntu/sources.list.backports.erb
templates/Ubuntu/sources.list.deb-src.erb
Diffstat (limited to 'files/50unattended-upgrades')
0 files changed, 0 insertions, 0 deletions