Viewing all changes in revision 3194.1.4.
- Committer: Andrew Bennetts
- Date: 2008-03-16 00:39:40 UTC
- mfrom: (3282 +trunk)
- mto: This revision was merged to the branch mainline in revision 3283.
- Revision ID: andrew.bennetts@canonical.com-20080316003940-15xikpqj8zq76isp
Merge from bzr.dev.
- files added:
- bzrlib/directory_service.py
- doc/en/admin-guide
- files removed:
- bzrlib/plugins/multiparent.py
- files renamed:
- bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py
- bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
