diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-21 07:20:07 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-21 07:20:07 +0100 |
| commit | f744c64c591cec9e5aa489a9af55e1ed6d1871d1 (patch) | |
| tree | de1d27910d66062508b22c5a7b46c288d1b3fab9 /methods/http_main.cc | |
| parent | 7f316a3feab95370f1dd28c08c58bc3c140bf0a0 (diff) | |
| parent | 1700c3cfb902f3f61fa4d9269523467fcceaaf58 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental-no-abi-break' into feature/source-deb822
Conflicts:
test/integration/test-apt-sources-deb822
Diffstat (limited to 'methods/http_main.cc')
0 files changed, 0 insertions, 0 deletions