-
Committer:
Vincent Ladeuil
-
Date:
2010-02-10 15:46:03 UTC
-
mfrom:
(4985.3.21 update)
-
mto:
This revision was merged to the branch mainline in
revision
5021.
-
Revision ID:
v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
Update performs two merges in a more logical order but stop on conflicts