c3bf54a merge changes from version/4.00 from 4.00.1 to r13697

Authored and Committed by Damien Doligez 10 years ago
    merge changes from version/4.00 from 4.00.1 to r13697
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13699 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
    
        
file modified
+34 -36
file modified
+1 -1
file modified
+12 -5
file modified
+2 -1
file modified
+1 -1
file modified
+33 -18
file modified
+6 -1
file modified
+1 -1