[Pkg-ocaml-maint-commits] [ocaml-ipaddr] 02/07: Merge tag 'upstream/2.7.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 f05079ab29f9c635912d05cc5af24ee0585f7f40
Merge: 41dfda5 8ccc56a
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jul 22 13:18:48 2016 +0200

    Merge tag 'upstream/2.7.0'
    
    Upstream version 2.7.0

 .travis.yml             |  22 ++++--
 CHANGES                 |   7 ++
 LICENSE                 |  14 ++++
 _oasis                  |   8 +-
 _tags                   |  22 +++---
 lib/META                |   8 +-
 lib/ipaddr.ml           |  29 +++++---
 lib/ipaddr.mli          |  36 ++++++---
 lib/macaddr.ml          |   2 +-
 lib/macaddr.mli         |   4 +-
 lib_test/test_ipaddr.ml |  21 ++++++
 myocamlbuild.ml         |  98 ++++++++++++------------
 opam                    |   4 +-
 setup.ml                | 194 ++++++++++++++++++++++++++++--------------------
 14 files changed, 294 insertions(+), 175 deletions(-)

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