[Python-modules-commits] [django-floppyforms] 02/05: record new upstream branch created by importing django-floppyforms_1.6.0+dfsg.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-floppyforms.

commit 055b573af6398751a87658e068929a913e7685f5
Merge: 6d4ee1e 1a05800
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Dec 5 18:23:51 2015 +0100

    record new upstream branch created by importing django-floppyforms_1.6.0+dfsg.orig.tar.gz and merge it

 .travis.yml                      |  4 ++++
 CHANGES.rst                      |  9 ++++++++-
 README.rst                       |  4 ++--
 debian/.git-dpm                  | 14 +++++++-------
 floppyforms/__future__/models.py | 11 ++++++++---
 floppyforms/__init__.py          | 11 ++++++++---
 floppyforms/compat.py            |  8 ++++++++
 floppyforms/fields.py            | 10 +++++++---
 floppyforms/gis/widgets.py       |  2 +-
 floppyforms/models.py            |  2 +-
 floppyforms/widgets.py           | 10 ++++++----
 requirements/tests.txt           |  2 +-
 setup.py                         |  1 +
 tox.ini                          |  8 +++++---
 14 files changed, 67 insertions(+), 29 deletions(-)

diff --cc debian/.git-dpm
index 95433dc,0000000..e3afea1
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
- e6fe937e8c9e3a33ef6a08989d918c412fd05d8e
- e6fe937e8c9e3a33ef6a08989d918c412fd05d8e
- e6fe937e8c9e3a33ef6a08989d918c412fd05d8e
- e6fe937e8c9e3a33ef6a08989d918c412fd05d8e
- django-floppyforms_1.5.2+dfsg.orig.tar.gz
- 69082af3b507f1a649d1a4a6d04eccc735d4268d
- 1139268
++1a058001ef9348387831dee191443d2defdd2a93
++1a058001ef9348387831dee191443d2defdd2a93
++1a058001ef9348387831dee191443d2defdd2a93
++1a058001ef9348387831dee191443d2defdd2a93
++django-floppyforms_1.6.0+dfsg.orig.tar.gz
++f8171a9115d875f331e99c442df7e6e6c7360305
++1139536
 +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-floppyforms.git