[Pkg-ocaml-maint-commits] [mysql-ocaml] 02/05: Merge tag 'upstream/1.1.2'

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository mysql-ocaml.

commit 57fdd9de5f7510bfc0a12765beb7b0fe1b7d148c
Merge: 3927e7f 0d5af89
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Nov 28 08:05:09 2013 +0100

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2

 .gitignore    |  17 ++++++++++
 CHANGES       |   3 ++
 Makefile.in   |   4 +--
 Makefile.msvc |   1 +
 VERSION       |   2 +-
 demo2.ml      |  24 +++++++-------
 mysql.ml      | 104 ++++++++++++++++++++++++++--------------------------------
 mysql.mli     |  99 +++++++++++++++++++++++++++++--------------------------
 mysql_stubs.c |  46 +++++++++++++++++++-------
 9 files changed, 170 insertions(+), 130 deletions(-)

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