[Python-modules-commits] [pytest] 06/13: merge patched into master

[Sebastian Ramacher]

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

sramacher pushed a commit to branch master
in repository pytest.

commit 0cd5c4f6ae0c320d1ffd31b1a29614f3dd7e8f82
Merge: db1964b ffe358a
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Feb 15 21:50:39 2016 +0100

    merge patched into master

 debian/.git-dpm |  2 +-
 setup.py        | 26 +++-----------------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --cc debian/.git-dpm
index 676e3a7,0000000..bdbadda
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
 +82d23da686d6109b288056ab42dc3b0a88efc476
- 82d23da686d6109b288056ab42dc3b0a88efc476
++ffe358a553baea873e09576f67841947909f8237
 +b3de031a07fd5ca0f809f15c736f9aa0016e573c
 +b3de031a07fd5ca0f809f15c736f9aa0016e573c
 +pytest_2.8.7.orig.tar.gz
 +58474cc27e8737ddde907b8d7b9917fc88493b1f
 +564943
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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