[Python-modules-commits] [django-taggit] 04/04: Merge tag 'upstream/0.18.2'

[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 f617eedb1b276d0fa76dde49d3d1e1cd22256f72
Merge: 25e5752 47ef835
Author: Michal Čihař <nijel at debian.org>
Date:   Thu May 12 09:30:09 2016 +0200

    Merge tag 'upstream/0.18.2'
    
    Upstream version 0.18.2
    
    # gpg: Podpis vytvořen Čt 12. květen 2016, 09:30:08 CEST pomocí klíče RSA s ID uživatele 42B7511D
    # gpg: Dobrý podpis od "Michal Čihař <michal at cihar.com>"
    # gpg:                 alias "Michal Čihař <nijel at users.sourceforge.net>"
    # gpg:                 alias "Michal Čihař <nijel at debian.org>"
    # gpg:                 alias "[jpeg image of size 8848]"

 CHANGELOG.txt                    | 10 +++++
 PKG-INFO                         |  2 +-
 django_taggit.egg-info/PKG-INFO  |  2 +-
 docs/api.txt                     |  2 +
 docs/custom_tagging.txt          |  2 +-
 runtests.py                      |  5 +++
 taggit/__init__.py               |  2 +-
 taggit/managers.py               | 93 ++++++++++++++++++++++++----------------
 taggit/utils.py                  | 14 ++++++
 tests/migrations/0001_initial.py | 46 ++++++++++----------
 tests/models.py                  | 16 +++----
 tests/tests.py                   | 61 +++++++++++++++++++-------
 tox.ini                          | 12 ++++++
 13 files changed, 181 insertions(+), 86 deletions(-)

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