Viewing all changes in revision 2692.1.24.
- Committer: Andrew Bennetts
- Date: 2008-03-27 06:10:18 UTC
- mfrom: (3309 +trunk)
- mto: This revision was merged to the branch mainline in revision 3320.
- Revision ID: andrew.bennetts@canonical.com-20080327061018-dxztpxyv6yoeg3am
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
