[Python-modules-commits] [contextlib2] 01/02: Merge branch 'master' into jessie-backports

[Tristan Seligmann]

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

mithrandi pushed a commit to branch jessie-backports
in repository contextlib2.

commit 63a69ca5b93d472c5753a57297a15e6d88018bb4
Merge: 01b3a7c de24182
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Jun 10 12:56:18 2017 +0200

    Merge branch 'master' into jessie-backports

 CONTRIBUTING.md                  |  3 +++
 MANIFEST.in                      |  3 +--
 NEWS.rst                         | 36 +++++++++++++++++++++++++-----------
 PKG-INFO                         | 24 ++++++++++++++----------
 README.rst                       | 20 ++++++++++++--------
 VERSION.txt                      |  2 +-
 contextlib2.egg-info/PKG-INFO    | 24 ++++++++++++++----------
 contextlib2.egg-info/SOURCES.txt |  1 +
 contextlib2.py                   |  3 +++
 debian/.git-dpm                  | 14 +++++++-------
 debian/changelog                 |  6 ++++++
 docs/index.rst                   |  4 ++--
 setup.cfg                        |  2 +-
 test_contextlib2.py              | 38 ++++++++++++++++++++++++++++++++++++++
 14 files changed, 128 insertions(+), 52 deletions(-)

diff --cc debian/changelog
index 5a181b8,520fb3b..4ac5ff9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ contextlib2 (0.5.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Mon, 10 Oct 2016 01:04:15 +0200
+ 
 +contextlib2 (0.5.3-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  
 + -- Tristan Seligmann <mithrandi at debian.org>  Sun, 22 May 2016 04:09:37 +0200
 +
  contextlib2 (0.5.3-1) unstable; urgency=medium
  
    [ Tristan Seligmann ]

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