-
Committer:
Martin Packman
-
Date:
2011-12-14 16:16:16 UTC
-
mfrom:
(6364 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6367.
-
Revision ID:
martin.packman@canonical.com-20111214161616-1wf1sdj4w89173pv
Merge bzr.dev to resolve conflict in release notes