[Pkg-ocaml-maint-commits] [ocaml-ipaddr] 02/06: Merge tag 'upstream/2.6.0'

[Mehdi Dogguy]

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

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

commit d0ee6aad84b329d958a7b4b4f2e3aad641a3c170
Merge: 002c208 eb53d6d
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Jan 18 00:11:46 2016 +0100

    Merge tag 'upstream/2.6.0'
    
    Upstream version 2.6.0

 .travis-ci.sh           |  30 ---------
 .travis.yml             |   9 +--
 CHANGES                 |  10 +++
 _oasis                  |   4 +-
 _tags                   |   5 +-
 lib/META                |   8 +--
 lib/ipaddr.ml           | 165 +++++++++++++++++++++++++++++++++++++++++-------
 lib/ipaddr.mli          |  93 +++++++++++++++++++++------
 lib/macaddr.ml          |  26 ++++----
 lib_test/Makefile       |  27 ++++++--
 lib_test/test_ipaddr.ml |  52 ++++++++++++++-
 opam                    |  37 +++++++++++
 setup.ml                |   9 +--
 13 files changed, 367 insertions(+), 108 deletions(-)

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