Viewing all changes in revision 6031.1.1.
- Committer: John Arbash Meinel
- Date: 2011-07-18 15:09:20 UTC
- mfrom: (6015.3.5 2.4)
- mto: This revision was merged to the branch mainline in revision 6032.
- Revision ID: john@arbash-meinel.com-20110718150920-19l4k8i6djiiv0j3
Merge bzr/2.4 into bzr.dev. Resolve a release-notes (NEWS) conflict, in favor of putting
the 2.4 entry into 2.5 where it belonged.
the 2.4 entry into 2.5 where it belonged.
expand all
collapse all
added
removed
