Merge lp://staging/~vila/bzr/integration into lp://staging/bzr

Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 6621
Proposed branch: lp://staging/~vila/bzr/integration
Merge into: lp://staging/bzr
Diff against target: 31 lines (+4/-4)
2 files modified
bzrlib/lazy_regex.py (+3/-3)
doc/en/release-notes/bzr-2.7.txt (+1/-1)
To merge this branch: bzr merge lp://staging/~vila/bzr/integration
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+315908@code.staging.launchpad.net

Commit message

Merge 2.7 into trunk including fix for bug #1657238

Description of the change

Merge 2.7 into trunk including fix for bug #1657238

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

Re-sync trunk with 2.7.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.