diff options
| author | Michael Vogt <mvo@debian.org> | 2013-08-26 18:42:58 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-26 18:42:58 +0200 |
| commit | d83f4c2e06b372d2871fcf0bfe5b7b2bbbfb2fc2 (patch) | |
| tree | c909e02a4b4caf5d0da00243632a3479574f2350 /doc/examples/ftp-archive.conf | |
| parent | 671e82247726a34007be22a439431ce0e7f55b48 (diff) | |
| parent | c71c4768d1f25a9bbc4dacbd0f58758ec9a3290f (diff) | |
Merge branch 'debian/sid' of ssh://git.debian.org/git/apt/apt into debian/sid
Conflicts:
debian/changelog
Diffstat (limited to 'doc/examples/ftp-archive.conf')
0 files changed, 0 insertions, 0 deletions