← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/__init__.py

Merge from bzr.dev, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
27
27
import sys
28
28
 
29
29
from bzrlib import errors, ui
 
30
from bzrlib.smart import medium
30
31
from bzrlib.trace import mutter
31
32
from bzrlib.transport import (
32
33
    Transport,