[Python-modules-commits] [django-jinja] 02/03: record new upstream branch created by importing django-jinja-2.1.1.orig.tar.gz and merge it

[Edward Betts]

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

edward pushed a commit to tag debian/2.1.1-1
in repository django-jinja.

commit a721592cb280d2c2f9ee487f38ac0e5b043496f3
Merge: e8922f1 f1211bb
Author: Edward Betts <edward at 4angle.com>
Date:   Wed Dec 23 10:50:02 2015 +0000

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

 PKG-INFO                                         |   5 +-
 README.rst                                       |   6 +-
 debian/.git-dpm                                  |  14 +-
 django_jinja.egg-info/PKG-INFO                   |   5 +-
 django_jinja.egg-info/requires.txt               |   2 +-
 django_jinja/apps.py                             |   3 -
 django_jinja/backend.py                          | 134 ++++++++++-
 django_jinja/base.py                             | 281 ++---------------------
 django_jinja/cache.py                            |  10 +-
 django_jinja/library.py                          |   3 +-
 django_jinja/management/commands/makemessages.py |   4 +
 setup.py                                         |   7 +-
 12 files changed, 178 insertions(+), 296 deletions(-)

diff --cc debian/.git-dpm
index dde67c7,0000000..882e8df
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
- 017097d2f6e383831bc20806392a9c9fd289ca38
- 017097d2f6e383831bc20806392a9c9fd289ca38
- 017097d2f6e383831bc20806392a9c9fd289ca38
- 017097d2f6e383831bc20806392a9c9fd289ca38
- django-jinja_1.4.1.orig.tar.gz
- 330194fa2e0113d9d1e417b1fa1c920cb6669c36
- 16208
++f1211bbe22e36f6841855e5e0b939d32ab5d6b3c
++f1211bbe22e36f6841855e5e0b939d32ab5d6b3c
++f1211bbe22e36f6841855e5e0b939d32ab5d6b3c
++f1211bbe22e36f6841855e5e0b939d32ab5d6b3c
++django-jinja-2.1.1.orig.tar.gz
++91c18532d01a92724383dbbfcb69dfab755beb39
++15636
 +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-jinja.git