-
Committer:
Vincent Ladeuil
-
Date:
2011-08-24 14:39:01 UTC
-
mfrom:
(6015.24.2 2.4)
-
mto:
This revision was merged to the branch mainline in
revision
6100.
-
Revision ID:
v.ladeuil+lp@free.fr-20110824143901-h5dazndqo9hva99h
Merge 2.4 into trunk resolving conflicts