Viewing all changes in revision 6615.7.2.
- Committer: Vincent Ladeuil
- Date: 2017-01-15 18:54:42 UTC
- mfrom: (6615.3.4 merges)
- mto: (6615.3.5 merges)
- mto: This revision was merged to the branch mainline in revision 6620.
- Revision ID: v.ladeuil+lp@free.fr-20170115185442-3tly7hbvl0h0djgs
Merge 2.7 fixing conflicts
expand all
collapse all
added
removed
