-
Committer:
Vincent Ladeuil
-
Date:
2010-07-13 21:25:03 UTC
-
mfrom:
(5050.3.6 2.2)
-
mto:
This revision was merged to the branch mainline in
revision
5345.
-
Revision ID:
v.ladeuil+lp@free.fr-20100713212503-jwsjxmzyrcrqa0xf
Merge 2.2 into bzr.dev including fixes for bug #525571 and bug #494221