-
Committer:
Andrew Bennetts
-
Date:
2011-05-20 17:27:26 UTC
-
mfrom:
(5609.39.6 2.3)
-
mto:
This revision was merged to the branch mainline in
revision
5906.
-
Revision ID:
andrew.bennetts@canonical.com-20110520172726-7cezrw49x96kbom8
Merge lp:bzr/2.3, resolving conflict in stacked.txt.