diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-10-15 18:32:14 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-10-15 18:32:14 +0200 |
| commit | 0977f81757f42889a9edb761061529041afe0a06 (patch) | |
| tree | b8ccdbd39bce1a82de8afc587c9bbe5becfe2913 /prepare-release | |
| parent | 79e85ea6054c9f34572f06598f73782466b164a8 (diff) | |
| parent | 5afcfe2a51a9e47e95023b99bcab065d1975e950 (diff) | |
Merge branch 'debian/sid' into debian/experimental
The acquire code changed completely, so this is more an import of the
testcase and a new fix than the merge of an existent fix.
Conflicts:
apt-pkg/acquire-item.cc
Diffstat (limited to 'prepare-release')
0 files changed, 0 insertions, 0 deletions