-
Committer:
Martin Packman
-
Date:
2011-10-21 15:58:51 UTC
-
mfrom:
(6228 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6229.
-
Revision ID:
martin.packman@canonical.com-20111021155851-9wkw8u5okyq2l79q
Merge bzr.dev to resolve release notes conflict