Merge lp:~jelmer/bzr/merge-2.2-into-2.3 into lp:bzr/2.3

Proposed by Jelmer Vernooij on 2012-06-18
Status: Merged
Approved by: Martin Packman on 2012-06-18
Approved revision: 5667
Merged at revision: 5667
Proposed branch: lp:~jelmer/bzr/merge-2.2-into-2.3
Merge into: lp:bzr/2.3
To merge this branch: bzr merge lp:~jelmer/bzr/merge-2.2-into-2.3
Reviewer Review Type Date Requested Status
bzr-core 2012-06-18 Pending
Review via email: mp+110778@code.launchpad.net

Commit message

Merge bzr/2.2.

Description of the change

Merge 2.2 into 2.3.

No actual changes, but this resolves some conflicts.

To post a comment you must log in.

Subscribers

People subscribed via source and target branches