-
Committer:
Vincent Ladeuil
-
Date:
2010-06-29 16:21:13 UTC
-
mfrom:
(5325 +trunk)
-
mto:
(5247.1.12 first-try)
-
mto:
This revision was merged to the branch mainline in
revision
5326.
-
Revision ID:
v.ladeuil+lp@free.fr-20100629162113-xa6y33u17mfi024v
Merge bzr.dev into cleanup resolving conflicts