[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 35f4d1f548d4045ab6e75ed926bc9b19bccbc935
Merge: d0acdeca6c62f2560faeef6d5014fd5ddb60c932 01a97ea7e3773ce607d88002d1578c909e771fd1
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 7 12:31:31 2013 +0200

    Merge tag 'upstream/3.6.3'
    
    Upstream version 3.6.3
    
    Conflicts:
    	src/netstring/nethttp.ml
    	src/netsys/config.h


-- 
ocamlnet packaging