[Pkg-ocaml-maint-commits] [yojson] 02/05: Merge tag 'upstream/1.3.0'

[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 a6e86ac85780d5b1f33bded643bceedf1f09ceec
Merge: af80854 4d7c878
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jan 27 17:35:28 2016 +0100

    Merge tag 'upstream/1.3.0'
    
    Upstream version 1.3.0

 Makefile |  2 +-
 read.mli |  7 +++++++
 read.mll |  2 ++
 util.ml  | 13 ++++++++++---
 util.mli | 12 +++++++++---
 5 files changed, 29 insertions(+), 7 deletions(-)

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