[Pkg-ocaml-maint-commits] [yojson] 06/08: Merge tag 'upstream/1.2.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 yojson.

commit b9e7e2ab2b72826cdc8fc3c2c28f2b68a1365431
Merge: d0234b3 b490c9e
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Sep 10 11:57:36 2015 +0200

    Merge tag 'upstream/1.2.3'
    
    Upstream version 1.2.3

 .gitignore |  15 ++++-
 Changes    |  19 ++++++
 Makefile   |  23 ++++---
 read.mli   |  14 +++-
 read.mll   | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 test.json  |   3 +-
 util.ml    |   4 ++
 util.mli   |  15 +++--
 write.ml   |   4 +-
 9 files changed, 283 insertions(+), 29 deletions(-)

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