[Pkg-ocaml-maint-commits] [cairo-ocaml] 03/03: Merge remote-tracking branch 'origin/master'

[Stéphane Glondu]

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

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

commit 62c55f6a65deb80236270a736f34a8451fab05f3
Merge: 2cbe954 b11c48b
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Nov 21 11:41:19 2013 +0100

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog

 debian/changelog |    6 ++++++
 debian/control   |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index a91a9a6,a5a558c..6cd1760
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 -cairo-ocaml (1:1.2.0-3) UNRELEASED; urgency=low
++cairo-ocaml (1:1.2.0-4) UNRELEASED; urgency=low
+ 
+   * Fix a typo in package description (closes: #726933)
 -  
++
+  -- Ralf Treinen <treinen at debian.org>  Mon, 21 Oct 2013 08:21:00 +0200
+ 
 +cairo-ocaml (1:1.2.0-3) experimental; urgency=low
 +
 +  * Compile with OCaml >= 4.01
 +
 + -- Stéphane Glondu <glondu at debian.org>  Mon, 11 Nov 2013 08:10:09 +0100
 +
  cairo-ocaml (1:1.2.0-2) unstable; urgency=low
  
    * Fix FTBFS on bytecode architectures

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