This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository yojson.
commit 6955260dbd4876e8a2cf1ff74431f044d9048b5f Merge: 96865a2 e492073 Author: Stephane Glondu <st...@glondu.net> Date: Wed Jun 1 11:44:40 2016 +0200 Merge tag 'upstream/1.3.2' Upstream version 1.3.2 .gitignore | 2 + .merlin | 3 + Makefile | 31 +-- common.ml | 2 +- common.mli | 4 +- opam | 23 ++ pretty.ml | 54 ++--- read.mli | 6 +- read.mll | 622 +++++++++++++++++++++++++++---------------------------- safe.mli | 2 +- util.ml | 3 + write.ml | 72 +++---- write.mli | 6 +- write2.ml | 3 + write2.mli | 6 + yojson.ml.cppo | 4 + yojson.mli.cppo | 4 + yojson_biniou.ml | 66 +++--- 18 files changed, 475 insertions(+), 438 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/yojson.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits