-
Committer:
Vincent Ladeuil
-
Date:
2011-11-18 07:29:20 UTC
-
mfrom:
(6277 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6278.
-
Revision ID:
v.ladeuil+lp@free.fr-20111118072920-76q1ho772bkmnno2
Merge trunk to resolve news conflict