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

[Sylvain LE GALL]

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

gildor pushed a commit to branch master
in repository ocaml-fileutils.

commit 4676daea198dc75153bae5c6bb5b596d783e486d
Merge: aa1cf2e 024ef7e
Author: Sylvain Le Gall <sylvain at le-gall.net>
Date:   Sat May 2 15:09:24 2015 +0200

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

 debian/changelog | 18 +++++++++++++++---
 debian/control   |  4 ++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 0fa0108,9d51794..10d2bd1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,20 +1,26 @@@
- ocaml-fileutils (0.4.5-4) UNRELEASED; urgency=low
++ocaml-fileutils (0.4.5-5) UNRELEASED; urgency=low
 +
 +  * Remove Sylvain Le Gall from Uploaders.
 +
 + -- Sylvain Le Gall <gildor at debian.org>  Sat, 02 May 2015 15:06:40 +0200
 +
- ocaml-fileutils (0.4.5-3) unstable; urgency=low
+ ocaml-fileutils (0.4.5-4) unstable; urgency=low
  
+   * Team upload
+   * Upload to unstable
+ 
+  -- Stéphane Glondu <glondu at debian.org>  Tue, 03 Dec 2013 21:21:52 +0100
+ 
+ ocaml-fileutils (0.4.5-3) experimental; urgency=low
+ 
+   [ Stéphane Glondu ]
+   * Team upload
+   * Compile with OCaml >= 4
+ 
+   [ Hendrik Tews ]
    * enable tests again
  
-  -- Hendrik Tews <hendrik at askra.de>  Wed, 05 Jun 2013 10:22:53 +0200
+  -- Stéphane Glondu <glondu at debian.org>  Fri, 26 Jul 2013 22:11:05 +0200
  
  ocaml-fileutils (0.4.5-2) unstable; urgency=low
  

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