← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5853.1.4.

  • Committer: Vincent Ladeuil
  • Date: 2011-05-13 16:28:09 UTC
  • mfrom: (5609.38.2 2.3.4-dev)
  • mto: This revision was merged to the branch mainline in revision 5861.
  • Revision ID: v.ladeuil+lp@free.fr-20110513162809-8vlejtvnkeifnyc7
Merge 2.3 into trunk resolving conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: