[Pkg-ocaml-maint-commits] [pgocaml] 02/05: Merge tag 'upstream/2.2'

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository pgocaml.

commit c9b5a262cfc7fc4bde7d46a19e59e0244b63c1ef
Merge: 28c0498 0ec0ee8
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 17 23:39:12 2016 +0100

    Merge tag 'upstream/2.2'
    
    Upstream version 2.2

 CHANGELOG.txt           |   8 ++
 _oasis                  |  12 +--
 _tags                   |  51 ++++++++-----
 myocamlbuild.ml         |  88 ++++++++++++---------
 setup.ml                | 198 ++++++++++++++++++++++++++++--------------------
 src/META                |   8 +-
 src/PGOCaml_aux.ml      |  17 +++--
 src/PGOCaml_aux.mli     |   2 +-
 src/PGOCaml_generic.ml  |  40 ++++------
 src/PGOCaml_generic.mli |   2 +-
 10 files changed, 245 insertions(+), 181 deletions(-)

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