[Python-modules-commits] [django-taggit] 02/03: Merge tag 'upstream/0.17.4'

[Michal Cihar]

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

nijel pushed a commit to branch master
in repository django-taggit.

commit 0eae7363c00442bec93eb5ea7e40d84e2565b9b9
Merge: 2dc96fd 034a731
Author: Michal Čihař <nijel at debian.org>
Date:   Fri Nov 27 08:36:52 2015 +0100

    Merge tag 'upstream/0.17.4'
    
    Upstream version 0.17.4
    
    # gpg: Podpis vytvořen Pá 27. listopad 2015, 08:36:45 CET pomocí klíče DSA s ID uživatele 36E75604
    # gpg: Dobrý podpis od "Michal Čihař <michal at cihar.com>"
    # gpg:                 alias "Michal Čihař <cihar at email.cz>"
    # gpg:                 alias "Michal Čihař <nijel at users.sourceforge.net>"
    # gpg:                 alias "Michal Čihař <mcihar at suse.cz>"
    # gpg:                 alias "Michal Čihař <cihar at liten.cz>"
    # gpg:                 alias "Michal Čihař <nijel at debian.org>"
    # gpg:                 alias "Michal Čihař <mcihar at novell.com>"

 CHANGELOG.txt                    |  5 +++
 PKG-INFO                         |  2 +-
 django_taggit.egg-info/PKG-INFO  |  2 +-
 docs/custom_tagging.txt          | 84 +++++++++++++++++++++++++++++++++++-----
 taggit/__init__.py               |  2 +-
 taggit/managers.py               |  6 +--
 taggit/models.py                 | 20 +++++++++-
 tests/forms.py                   |  8 +++-
 tests/migrations/0001_initial.py | 61 +++++++++++++++++++++++++++--
 tests/models.py                  | 38 +++++++++++++++---
 tests/tests.py                   | 31 ++++++++++++---
 11 files changed, 226 insertions(+), 33 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/django-taggit.git