[Python-modules-commits] [python-django-extra-views] 06/11: 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 python-django-extra-views.

commit d507468c726004c3b002b9b871144b44dcf02b2f
Merge: a48a335 bf9f584
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Mar 16 11:03:37 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-template-backend-configuration-for-tests.patch | 28 ----------------------
 debian/patches/series                              |  1 -
 runtests.py                                        |  8 +------
 4 files changed, 3 insertions(+), 38 deletions(-)

diff --cc debian/.git-dpm
index 8351848,0000000..8438a5c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 7d0857b180d16c96bacb45f1f5956a7e8ab4c51e
- 7d0857b180d16c96bacb45f1f5956a7e8ab4c51e
++bf9f58450cc0a79d5d76cd24eba7fc6d72815255
++bf9f58450cc0a79d5d76cd24eba7fc6d72815255
 +bf9f58450cc0a79d5d76cd24eba7fc6d72815255
 +bf9f58450cc0a79d5d76cd24eba7fc6d72815255
 +python-django-extra-views_0.9.0.orig.tar.gz
 +838d610f7e590c64ae9bce619332e400da97cbc2
 +25744

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