[Pkg-ocaml-maint-commits] [coccinelle] 03/03: Merge branch 'master' of ssh://git.debian.org/git/pkg-ocaml-maint/packages/coccinelle

[Eugeniy Meshcheryakov]

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

eugen pushed a commit to branch master
in repository coccinelle.

commit 54158855b0f6cc3a0a9fb15e65ba607498f0df3a
Merge: 978449f 1809af7
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Mon Sep 7 00:34:37 2015 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-ocaml-maint/packages/coccinelle

 debian/changelog | 10 +++++++---
 debian/control   |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index db53272,76c572f..ce49072
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,12 @@@
- coccinelle (1.0.2.deb-1) unstable; urgency=medium
 -coccinelle (1.0.0.deb-2) UNRELEASED; urgency=medium
++coccinelle (1.0.2.deb-1) UNRELEASED; urgency=medium
  
-   * New upstream release 
++  [ Stéphane Glondu ]
+   * Add camlp4 to Build-Depends
  
-  -- Євгеній Мещеряков <eugen at debian.org>  Sun, 06 Sep 2015 23:07:01 +0200
 - -- Stéphane Glondu <glondu at debian.org>  Thu, 25 Jun 2015 08:30:16 +0200
++  [ Євгеній Мещеряков ]
++  * New upstream release
++
++ -- Євгеній Мещеряков <eugen at debian.org>  Mon, 07 Sep 2015 00:33:45 +0200
  
  coccinelle (1.0.0.deb-1) unstable; urgency=medium
  

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