[Python-modules-commits] [django-sekizai] 01/07: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository django-sekizai.

commit 39c98c8e42efb1f40fe065004143d705cf014c3c
Merge: 7b0a3fb cbe38b7
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Sep 1 10:06:49 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...jango-1.10-fix_runtests_lack_of_TEMPLATES.patch | 41 -------------------
 debian/patches/django-1.7.patch                    | 46 ----------------------
 debian/patches/series                              |  2 -
 runtests.py                                        | 20 +---------
 5 files changed, 3 insertions(+), 110 deletions(-)

diff --cc debian/.git-dpm
index 2e7b72b,0000000..6fa85ef
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
- 880b74889bbba237fe1bb17d992e1cbbb462be6b
- 880b74889bbba237fe1bb17d992e1cbbb462be6b
++cbe38b705eb5fecef3bfe58b07dbd1e2904d518d
++cbe38b705eb5fecef3bfe58b07dbd1e2904d518d
 +cbe38b705eb5fecef3bfe58b07dbd1e2904d518d
 +cbe38b705eb5fecef3bfe58b07dbd1e2904d518d
 +django-sekizai_0.9.0.orig.tar.gz
 +e678764d638d4c8645d75c567012d0190e184810
 +18569
 +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/django-sekizai.git