-
Committer:
Martin Packman
-
Date:
2011-11-28 19:07:58 UTC
-
mfrom:
(6318 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6319.
-
Revision ID:
martin.packman@canonical.com-20111128190758-5gj44o5uzwz5sjfq
Merge bzr.dev to resolve conflicts with updated registry help strings