-
Committer:
John Arbash Meinel
-
Date:
2009-10-15 20:04:37 UTC
-
mfrom:
(4748 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
4752.
-
Revision ID:
john@arbash-meinel.com-20091015200437-4wweb0t6uzspvv84
Bring in bzr.dev 4748, resolve conflict, update NEWS.