diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-26 08:15:29 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-26 08:15:29 +0100 |
| commit | 796673c38509300c988fbba2f2679ba3c76916db (patch) | |
| tree | 403055b486d0a1d65561528582d4b0bdc66e53a0 /methods/http_main.cc | |
| parent | 9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe (diff) | |
| parent | 2f958de6e883ba7b0c9895750d4dde35047f1e82 (diff) | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
apt-private/private-list.cc
doc/po/de.po
test/integration/framework
Diffstat (limited to 'methods/http_main.cc')
0 files changed, 0 insertions, 0 deletions