[Python-modules-commits] [django-polymorphic] 02/04: record new upstream branch created by importing django-polymorphic_0.7.2.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-polymorphic.

commit 9e0227fc56e98a67a0f355f24e89573f432af3fc
Merge: 55fc7e5 5388ff5
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Oct 12 12:49:13 2015 +0200

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

 .travis.yml                |  26 +++++-----
 debian/.git-dpm            |  14 +++---
 docs/admin.rst             |   2 +
 docs/changelog.rst         |  12 ++++-
 docs/conf.py               |   4 +-
 polymorphic/__version__.py |   2 +-
 polymorphic/admin.py       |   9 ++--
 polymorphic/base.py        |  15 +++---
 polymorphic/query.py       |  14 +++++-
 polymorphic/tests.py       |  22 ++++++++
 tox.ini                    | 122 ++++++---------------------------------------
 11 files changed, 97 insertions(+), 145 deletions(-)

diff --cc debian/.git-dpm
index 9c58bc0,0000000..f545d35
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
- c2c1a8d94bd07702957bd3492c46debcc36cf2c7
- c2c1a8d94bd07702957bd3492c46debcc36cf2c7
- c2c1a8d94bd07702957bd3492c46debcc36cf2c7
- c2c1a8d94bd07702957bd3492c46debcc36cf2c7
- django-polymorphic_0.7.1.orig.tar.gz
- 25182275d5c20fd19f0b81169f359d29a621d2ae
- 61942
++5388ff514d9a6f87d435cc4316dafd7cfde55832
++5388ff514d9a6f87d435cc4316dafd7cfde55832
++5388ff514d9a6f87d435cc4316dafd7cfde55832
++5388ff514d9a6f87d435cc4316dafd7cfde55832
++django-polymorphic_0.7.2.orig.tar.gz
++0ac96bb61c341f089c4be0238c09b39b296f759b
++62282
 +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-polymorphic.git