-
Committer:
John Arbash Meinel
-
Date:
2011-01-12 21:28:39 UTC
-
mfrom:
(5602 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
5605.
-
Revision ID:
john@arbash-meinel.com-20110112212839-lfzo8o183tw10gnd
Merge bzr.dev 5602 to, yet again, resolve a NEWS/bzr-2.3.txt conflict