[Python-modules-commits] [django-sitetree] 02/03: record new upstream branch created by importing django-sitetree_1.5.1.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-sitetree.

commit fbaec1963c2462e538e158179c17fefade3a559a
Merge: 4072ba9 2ec67e5
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Dec 26 21:25:43 2015 +0100

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

 .travis.yml                                        |  6 +--
 CHANGELOG                                          |  6 +++
 debian/.git-dpm                                    | 14 +++---
 setup.py                                           |  1 +
 sitetree/__init__.py                               |  2 +-
 sitetree/admin.py                                  | 51 ++++++++++++++++------
 sitetree/templates/admin/sitetree/tree/tree.html   | 19 +++++---
 .../admin/sitetree/treeitem/breadcrumbs.html       |  2 +-
 sitetree/templatetags/sitetree_compat.py           |  9 ++++
 tox.ini                                            |  2 +-
 10 files changed, 79 insertions(+), 33 deletions(-)

diff --cc debian/.git-dpm
index 06bbf2c,0000000..09ec058
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
- 8f1f79ad2a0414d60d39a71205aff0e343cc0ce0
- 8f1f79ad2a0414d60d39a71205aff0e343cc0ce0
- 8f1f79ad2a0414d60d39a71205aff0e343cc0ce0
- 8f1f79ad2a0414d60d39a71205aff0e343cc0ce0
- django-sitetree_1.5.0.orig.tar.gz
- 8286f06556a1d6a192aa11ad40852b930729693b
- 73189
++2ec67e5b81c45d542cb96f872a73bc64aed30c7c
++2ec67e5b81c45d542cb96f872a73bc64aed30c7c
++2ec67e5b81c45d542cb96f872a73bc64aed30c7c
++2ec67e5b81c45d542cb96f872a73bc64aed30c7c
++django-sitetree_1.5.1.orig.tar.gz
++c67020726839af67c17be2b64fc4d72f1406c52b
++73478
 +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-sitetree.git