-
Committer:
Vincent Ladeuil
-
Date:
2011-08-21 15:14:57 UTC
-
mfrom:
(6015.9.16 2.4)
-
mto:
This revision was merged to the branch mainline in
revision
6091.
-
Revision ID:
v.ladeuil+lp@free.fr-20110821151457-bppnur2h290un2nt
Merge 2.4 into trunk (including fix for bug #829237)