Viewing all changes in revision 6191.1.1.
- Committer: Vincent Ladeuil
- Date: 2011-10-06 07:43:13 UTC
- mfrom: (6015.33.8 2.4)
- mto: This revision was merged to the branch mainline in revision 6192.
- Revision ID: v.ladeuil+lp@free.fr-20111006074313-w3f2t8lgzy04pjjb
Merge 2.4 into trunk resolving conflicts
expand all
collapse all
added
removed
