[Pkg-ocaml-maint-commits] [sexplib310] 02/04: Merge tag 'upstream/111.25.00'

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository sexplib310.

commit 9f25782485921f153144210bf66d1b8b6eac33ba
Merge: dd84f1c e8c17fd
Author: Hilko Bengen <bengen at debian.org>
Date:   Tue Sep 16 22:09:48 2014 +0200

    Merge tag 'upstream/111.25.00'
    
    Upstream version 111.25.00

 CHANGES.md      |   1 +
 README.md       | 257 ++++++++++++++++++++++++++++++--------------------------
 _oasis          |   2 +-
 _tags           |   1 +
 lib/META        |   8 +-
 lib/conv.ml     |  65 ++++++++++++--
 myocamlbuild.ml |  10 ++-
 num/lib/META    |   4 +-
 setup.ml        |   6 +-
 unix/lib/META   |   4 +-
 10 files changed, 218 insertions(+), 140 deletions(-)

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