[Python-modules-commits] [pycurl] 11/19: Release

[Barry Warsaw]

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

barry pushed a commit to branch ubuntu
in repository pycurl.

commit 0d8508665b27c0bcd3412eeca2472ea5ae685703
Author: Barry Warsaw <barry at python.org>
Date:   Mon Oct 6 13:26:02 2014 -0400

    Release
---
 debian/changelog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 29afa56..1c4b549 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,7 @@ pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> Release.
  -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
@@ -75,6 +76,9 @@ pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
 =======
  -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
 >>>>>>> Release.
+=======
+ -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
+>>>>>>> Release
 
 pycurl (7.19.5-3) unstable; urgency=medium
 
@@ -130,7 +134,7 @@ pycurl (7.19.5-2) unstable; urgency=medium
       not needed since in Ubuntu, curl-config --static-libs doesn't return
       -lssh2.
 
- -- Barry Warsaw <barry at debian.org>  Wed, 01 Oct 2014 19:42:50 -0400
+ -- Barry Warsaw <barry at ubuntu.com>  Mon, 06 Oct 2014 13:25:09 -0400
 
 pycurl (7.19.5-2) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pycurl.git