[Pkg-ocaml-maint-commits] [ocaml-benchmark] 02/05: Merge tag 'upstream/1.3'

[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-benchmark.

commit 8248937c20565e9f61b9cdc58178d0b168b133c0
Merge: 61f9005 181ca34
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon May 4 08:42:31 2015 -0300

    Merge tag 'upstream/1.3'
    
    Upstream version 1.3

 META            |    4 +-
 Makefile        |    2 +-
 _oasis          |   17 +-
 myocamlbuild.ml |  172 +++---
 setup.ml        | 1713 ++++++++++++++++++++++++-------------------------------
 5 files changed, 865 insertions(+), 1043 deletions(-)

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