« back to all changes in this revision
Viewing changes to bzrlib/transport/http/_urllib2_wrappers.py
- Committer: Jelmer Vernooij
- Date: 2011-09-26 11:00:20 UTC
- mfrom: (6167 +trunk)
- mto: This revision was merged to the branch mainline in revision 6169.
- Revision ID: jelmer@samba.org-20110926110020-g86tgisgnuajlc2n
Merge bzr.dev.
- files added:
- bzrlib/estimate_compressed_size.py
- files renamed:
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
added
removed
bzrlib/transport/http/_urllib2_wrappers.py
