-
Committer:
Andrew Bennetts
-
Date:
2009-10-13 05:20:50 UTC
-
mfrom:
(4634.52.16 2.0)
-
mto:
This revision was merged to the branch mainline in
revision
4738.
-
Revision ID:
andrew.bennetts@canonical.com-20091013052050-u1w6tv0z7kqhn8d0
Merge 2.0 into lp:bzr, resolving conflicts in NEWS and releasing.txt.