[Pkg-ocaml-maint-commits] [ocaml-ipaddr] 07/10: Merge tag 'upstream/2.5.0'

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-ipaddr.

commit 1a59915768406801b8943d39e0e209bba2e47957
Merge: a4dc7ec bcfa3eb
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jun 26 15:02:39 2014 +0200

    Merge tag 'upstream/2.5.0'
    
    Upstream version 2.5.0

 .travis-ci.sh            |    4 +-
 CHANGES                  |   44 +
 Makefile                 |   11 +-
 README.md                |   18 +-
 _oasis                   |   38 +-
 _tags                    |   17 +-
 lib/META                 |   27 +-
 lib/ipaddr.ml            |  874 +++++++++++++++++---
 lib/ipaddr.mldylib       |    5 +
 lib/ipaddr.mli           |  504 +++++++++++-
 lib/ipaddr_unix.ml       |   48 ++
 lib/ipaddr_unix.mldylib  |    4 +
 lib/ipaddr_unix.mli      |   59 ++
 lib/ipaddr_unix.mllib    |    4 +
 lib/macaddr.ml           |   97 ++-
 lib/macaddr.mli          |    8 +-
 lib_test/Makefile        |    6 +-
 lib_test/test_ipaddr.ml  |  767 +++++++++++++----
 lib_test/test_macaddr.ml |   19 +-
 myocamlbuild.ml          |  373 ++++++---
 setup.ml                 | 2036 ++++++++++++++++++++++++++++++++++++----------
 top/ipaddr_top.ml        |   24 +
 top/ipaddr_top.mldylib   |    4 +
 top/ipaddr_top.mllib     |    4 +
 24 files changed, 4121 insertions(+), 874 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-ipaddr.git