~bzr-pqm/bzr/bzr.dev

Committer: Robert Collins
Date: 2009-08-30 21:34:42 UTC
mfrom: <a title="Merged From 4634.6.11" href="/~bzr-pqm/bzr/bzr.dev/revision/4634.6.11?remember=5401">(4634.6.11 2.0)
mto: <a title="Merged In 4657.1.4" href="/~bzr-pqm/bzr/bzr.dev/revision/4657.1.4?remember=5401">(4657.1.4 bug-416732)
mto: This revision was merged to the branch mainline in revision 4664 .
Revision ID: robertc@robertcollins.net-20090830213442-5wkf4ii9pno1ft5e

(robertc) Merge 2.0 to bzr.dev, including fixes for log and serialisation of IncompatibleRepositories. (Robert Collins, John Arbash Meinel)

added added

removed removed