-
Committer:
Andrew Bennetts
-
Date:
2010-11-10 02:01:33 UTC
-
mfrom:
(5050.45.9 2.2)
-
mto:
This revision was merged to the branch mainline in
revision
5536.
-
Revision ID:
andrew.bennetts@canonical.com-20101110020133-n6ym1tbhmozyshl5
Merge lp:bzr/2.2, resolving run_script syntax conflicts and resyncing 2.2.2's release notes.