diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-12 09:23:20 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-12 09:23:20 +0100 |
| commit | 183d522362c95309d70baa418b54096599c17653 (patch) | |
| tree | 9f0c12dc542c3ec627d7cc384ec55838ae9e63fc /apt-pkg/aptconfiguration.cc | |
| parent | ce55512d4924b52c985276c62a0c69ac13e203cd (diff) | |
| parent | 8f3594c3487800edc2a97af1f3290049776dc556 (diff) | |
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
Conflicts:
test/integration/test-apt-get-download
Diffstat (limited to 'apt-pkg/aptconfiguration.cc')
0 files changed, 0 insertions, 0 deletions