[Python-modules-commits] [nevow] 09/10: merge patched into master

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository nevow.

commit 6621de4966abc586250b75e46a93a300f02bfc5b
Merge: 087d6a5 643a807
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Wed Feb 17 16:54:26 2016 +0200

    merge patched into master

 debian/.git-dpm                         |  4 ++--
 debian/patches/41-disable-test_oldstyle | 29 -----------------------------
 debian/patches/series                   |  1 -
 nevow/test/test_appserver.py            |  2 --
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --cc debian/.git-dpm
index 7fd8d41,0000000..1dcea8a
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
- 889c3fbdef475eca9288aeefd3608bfa39d0c6f2
- 889c3fbdef475eca9288aeefd3608bfa39d0c6f2
++643a8070e72d90f8ba76f8f0a008d85b9d489108
++643a8070e72d90f8ba76f8f0a008d85b9d489108
 +643a8070e72d90f8ba76f8f0a008d85b9d489108
 +643a8070e72d90f8ba76f8f0a008d85b9d489108
 +nevow_0.13.0.orig.tar.gz
 +581c5ca9a79f55534821ae783db45159bb7b5001
 +528151
 +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/nevow.git