-
Committer:
Andrew Bennetts
-
Date:
2010-01-07 05:22:46 UTC
-
mfrom:
(4937 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
4938.
-
Revision ID:
andrew.bennetts@canonical.com-20100107052246-016t0jzmc0j9g7dl
Merge lp:bzr, resolving NEWS conflict.