[Python-modules-commits] [moksha.hub] 01/02: merge patched into master

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository moksha.hub.

commit 0aefe5aff19cf33f3b87c3183a0384ea8559b89f
Merge: 6c11c0d 50a0418
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Thu Jan 12 22:54:42 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Account-for-twisted-package-split.patch   | 25 ----------------------
 debian/patches/series                              |  1 -
 setup.py                                           |  2 +-
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --cc debian/.git-dpm
index 7356ed8,0000000..fbc90d4
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
- 1c5242747f5b7db7a6e0806486a019ed1b2ba870
- 1c5242747f5b7db7a6e0806486a019ed1b2ba870
++50a0418482116be28a9f1223005c7499e8bbce42
++50a0418482116be28a9f1223005c7499e8bbce42
 +50a0418482116be28a9f1223005c7499e8bbce42
 +50a0418482116be28a9f1223005c7499e8bbce42
 +moksha.hub_1.4.1.orig.tar.gz
 +0ff0ac485f2385dd8c8d296bd0a2cc18184f835b
 +27328
 +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/moksha.hub.git