-
Committer:
Vincent Ladeuil
-
Date:
2011-05-28 15:41:39 UTC
-
mfrom:
(5935 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
5936.
-
Revision ID:
v.ladeuil+lp@free.fr-20110528154139-fdxnfx42f6kfmotd
Merge trunk resolving news conflict