-
Committer:
Andrew Bennetts
-
Date:
2010-08-17 06:45:33 UTC
-
mfrom:
(5050.17.9 2.2)
-
mto:
This revision was merged to the branch mainline in
revision
5379.
-
Revision ID:
andrew.bennetts@canonical.com-20100817064533-kof2i2f3r6mr4ayb
Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859, #224373, #300062, #585667, #614404, #617503.