[Pkg-ocaml-maint-commits] [ocaml-ipaddr] 04/06: Merge tag 'upstream/2.6.1'

[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 ec7ae607b3f1cd2e1baf2a467b9b51615604cc2d
Merge: d0ee6aa 0c04b4f
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Jan 18 00:11:54 2016 +0100

    Merge tag 'upstream/2.6.1'
    
    Upstream version 2.6.1

 .travis.yml | 6 +++---
 CHANGES     | 3 +++
 _oasis      | 2 +-
 lib/META    | 4 ++--
 setup.ml    | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

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