Viewing all changes in revision 6059.2.3.
- Committer: Vincent Ladeuil
- Date: 2011-08-12 14:07:21 UTC
- mfrom: (6065 +trunk)
- mto: (6059.4.3 migrate-config-options)
- mto: This revision was merged to the branch mainline in revision 6068.
- Revision ID: v.ladeuil+lp@free.fr-20110812140721-js88s3h388owol9o
Merge trunk to resolve conflicts
- files modified:
- bzrlib/config.py
expand all
collapse all
added
removed
