[Python-modules-commits] [django-markupfield] 02/08: record new upstream branch created by importing django-markupfield_1.4.0.orig.tar.gz and merge it

[Michael Fladischer]

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

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

commit 765fa38eb13cd500abfd5013626b4468e6324ed3
Merge: 8ddd767 73e1359
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Dec 19 20:52:51 2015 +0100

    record new upstream branch created by importing django-markupfield_1.4.0.orig.tar.gz and merge it

 CHANGELOG                               |  5 +++
 LICENSE                                 |  5 +--
 PKG-INFO                                | 18 ++++-----
 README.rst                              | 14 +++----
 debian/.git-dpm                         | 14 +++----
 django_markupfield.egg-info/PKG-INFO    | 18 ++++-----
 django_markupfield.egg-info/SOURCES.txt |  2 +-
 django_markupfield.egg-info/pbr.json    |  1 +
 markupfield/__init__.py                 |  2 +-
 markupfield/fields.py                   | 28 ++++++--------
 markupfield/markup.py                   |  8 ----
 markupfield/models.py                   |  0
 markupfield/tests/models.py             |  2 +-
 markupfield/tests/settings.py           |  2 +
 markupfield/tests/tests.py              | 68 ++++++++++++++++++++++++---------
 setup.py                                |  4 +-
 16 files changed, 103 insertions(+), 88 deletions(-)

diff --cc debian/.git-dpm
index 80de4a2,0000000..9210845
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
- 5d641c9cce4ba2cf4a7e18177057723e824aaa21
- 5d641c9cce4ba2cf4a7e18177057723e824aaa21
- 5d641c9cce4ba2cf4a7e18177057723e824aaa21
- 5d641c9cce4ba2cf4a7e18177057723e824aaa21
- django-markupfield_1.3.5.orig.tar.gz
- 10eeebda86614df3cd10f329efa63a4c6ec14d1e
- 13681
++73e1359a6e4a8aee7052cbb84e638d623a39396a
++73e1359a6e4a8aee7052cbb84e638d623a39396a
++73e1359a6e4a8aee7052cbb84e638d623a39396a
++73e1359a6e4a8aee7052cbb84e638d623a39396a
++django-markupfield_1.4.0.orig.tar.gz
++26bc900bad3bd6213b58215c6e7852ce424e9bc1
++15730
 +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