-
Committer:
Martin Packman
-
Date:
2011-11-24 12:11:56 UTC
-
mfrom:
(6285 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6287.
-
Revision ID:
martin.packman@canonical.com-20111124121156-s5b055v8gig16b02
Merge bzr.dev to resolve conflict in bb.test_rmbranch