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

[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 afd6e2a7f9097725930a2dfd02792d57eafefbb4
Merge: 1c0473a c0fc118
Author: Michal Čihař <nijel at debian.org>
Date:   Mon Jan 25 15:45:35 2016 +0100

    Merge tag 'upstream/0.18.0'
    
    Upstream version 0.18.0
    
    # gpg: Podpis vytvořen Po 25. leden 2016, 15:45:31 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ř <nijel at debian.org>"

 CHANGELOG.txt                      |  7 +++++++
 PKG-INFO                           |  3 +--
 django_taggit.egg-info/PKG-INFO    |  3 +--
 django_taggit.egg-info/SOURCES.txt |  1 +
 docs/custom_tagging.txt            | 38 ++++++++++++++++++++++++++++++++++++--
 setup.py                           |  1 -
 taggit/__init__.py                 |  2 +-
 taggit/managers.py                 | 15 +++++++--------
 taggit/models.py                   |  3 ++-
 taggit/utils.py                    | 34 ++++++++++++++++++++++++++++++++--
 tests/custom_parser.py             |  5 +++++
 tests/tests.py                     | 15 +++++++++++++++
 tox.ini                            | 18 ------------------
 13 files changed, 108 insertions(+), 37 deletions(-)

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