-
Committer:
Vincent Ladeuil
-
Date:
2011-05-17 15:14:38 UTC
-
mfrom:
(5050.73.3 2.2)
-
mto:
(5609.39.5 2.3)
-
mto:
This revision was merged to the branch mainline in
revision
5885.
-
Revision ID:
v.ladeuil+lp@free.fr-20110517151438-j75xuw2zm9alk9a5
Merge 2.2 into 2.3 resolving conflicts