[Python-modules-commits] [pytest-localserver] 11/14: record new upstream branch created by importing pytest-localserver_0.3.5.orig.tar.xz and merge it

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository pytest-localserver.

commit e97e5ed8a587bc4f6d5ef9bf8978fd6606ffb5ea
Merge: 7965cbf aeeac0f
Author: Daniel Stender <stender at debian.org>
Date:   Fri Mar 18 18:30:50 2016 +0100

    record new upstream branch created by importing pytest-localserver_0.3.5.orig.tar.xz and merge it

 debian/.git-dpm                    | 12 +++---
 pytest_localserver/server.pem.orig | 81 --------------------------------------
 2 files changed, 6 insertions(+), 87 deletions(-)

diff --cc debian/.git-dpm
index 22132a1,0000000..13ab1f3
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
- c915ba72bf1441d3b81f52883abd5dc5c291d14a
- c915ba72bf1441d3b81f52883abd5dc5c291d14a
- c915ba72bf1441d3b81f52883abd5dc5c291d14a
- c915ba72bf1441d3b81f52883abd5dc5c291d14a
++aeeac0f2985da0666c221b4211a6d511e8b47318
++aeeac0f2985da0666c221b4211a6d511e8b47318
++aeeac0f2985da0666c221b4211a6d511e8b47318
++aeeac0f2985da0666c221b4211a6d511e8b47318
 +pytest-localserver_0.3.5.orig.tar.xz
- 59482eb1ce1567fb3b76255e1e1bf8d47fd26c4e
- 16924
++957b075e192dc00e716ca829659d527b2993c307
++16904
 +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-localserver.git