[Python-modules-commits] [django-markupfield] 03/06: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to tag debian/1.4.1-1
in repository django-markupfield.

commit 87998d2dc21d986cb59dad51806b16ca7becd448
Merge: 45cb363 e2eb281
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Oct 18 14:16:56 2016 +0200

    merge patched into master

 CHANGELOG                                          |  4 +++
 PKG-INFO                                           | 13 +++++++--
 README.rst                                         | 11 +++++--
 debian/.git-dpm                                    |  6 ++--
 ...d-required-attribute-for-Django-1.10-test.patch | 23 ---------------
 ...t-instance-to-formfield_for_dbfield-metho.patch | 34 ----------------------
 debian/patches/series                              |  2 --
 django_markupfield.egg-info/PKG-INFO               | 13 +++++++--
 django_markupfield.egg-info/pbr.json               |  2 +-
 markupfield/__init__.py                            |  2 +-
 markupfield/tests/tests.py                         | 22 +++++++++-----
 setup.py                                           |  2 +-
 12 files changed, 53 insertions(+), 81 deletions(-)

diff --cc debian/.git-dpm
index e14f92e,0000000..c489e9b
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
- b222996a7d9bb5447bb7e7202c5ec517ee4549cd
- b222996a7d9bb5447bb7e7202c5ec517ee4549cd
- 73e1359a6e4a8aee7052cbb84e638d623a39396a
++e2eb281a0d63f467ad9aa2c1e2eb469ce8189b16
++e2eb281a0d63f467ad9aa2c1e2eb469ce8189b16
++e2eb281a0d63f467ad9aa2c1e2eb469ce8189b16
 +e2eb281a0d63f467ad9aa2c1e2eb469ce8189b16
 +django-markupfield_1.4.1.orig.tar.gz
 +1c6ab34353567663a795116b5da715a3784bccba
 +16127
 +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-markupfield.git