Viewing all changes in revision 6260.3.3.
- Committer: Vincent Ladeuil
- Date: 2011-11-17 17:16:09 UTC
- mfrom: (6272 +trunk)
- mto: This revision was merged to the branch mainline in revision 6273.
- Revision ID: v.ladeuil+lp@free.fr-20111117171609-pzs107pdm0vndlf9
merge trunk to resolve conflicts on news
- files modified:
- bzrlib/branch.py
expand all
collapse all
added
removed
