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

[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 14b22c67555e08d1cdbcf590e3b5dd66ed1387e8
Merge: b54484c a17a615
Author: Michal Čihař <nijel at debian.org>
Date:   Thu Oct 29 14:43:54 2015 +0100

    Merge tag 'upstream/0.17.3'
    
    Upstream version 0.17.3
    
    # gpg: Podpis vytvořen Čt 29. říjen 2015, 14:43:51 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                      |  10 +++++++
 PKG-INFO                           |   2 +-
 django_taggit.egg-info/PKG-INFO    |   2 +-
 django_taggit.egg-info/SOURCES.txt |   8 +----
 taggit/__init__.py                 |   2 +-
 taggit/managers.py                 |  58 +++++++++++++++++++++++++++++--------
 taggit/migrations/0001_initial.py  |   4 +--
 taggit/models.py                   |   3 +-
 tests/__init__.pyc                 | Bin 144 -> 0 bytes
 tests/forms.pyc                    | Bin 2146 -> 0 bytes
 tests/migrations/0001_initial.pyc  | Bin 8258 -> 0 bytes
 tests/migrations/__init__.pyc      | Bin 155 -> 0 bytes
 tests/models.pyc                   | Bin 11096 -> 0 bytes
 tests/tests.pyc                    | Bin 31439 -> 0 bytes
 tox.ini                            |  14 +++++++++
 15 files changed, 78 insertions(+), 25 deletions(-)

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