[Python-modules-commits] [contextlib2] 07/07: Merge / resolve conflicts.

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository contextlib2.

commit 57a3d2e17df500beef2fce38da8d973c3400b406
Merge: dfdac0f 3832900
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Thu May 5 03:12:53 2016 +0200

    Merge / resolve conflicts.

 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --cc debian/changelog
index d1cba28,5828e21..71f6c33
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,13 @@@
 -contextlib2 (0.5.1-2) UNRELEASED; urgency=medium
 +contextlib2 (0.5.3-1) unstable; urgency=medium
  
+   [ Tristan Seligmann ]
    * Add version to unittest2 build-dependencies.
 +  * New upstream release.
 +  * Ship .pydist files.
 +  * Bump Standards-Version to 3.9.8 (no changes).
 +  * Update Vcs-* URLs for https.
  
 -  [ Ondřej Nový ]
 -  * Fixed VCS URL (https)
 -
 - -- Tristan Seligmann <mithrandi at debian.org>  Wed, 27 Jan 2016 04:23:56 +0200
 + -- Tristan Seligmann <mithrandi at debian.org>  Thu, 05 May 2016 03:10:07 +0200
  
  contextlib2 (0.5.1-1) unstable; urgency=medium
  

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