-
Committer:
Vincent Ladeuil
-
Date:
2012-03-08 18:30:33 UTC
-
mfrom:
(6487 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6488.
-
Revision ID:
v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts