[Python-modules-commits] [python-slugify] 02/04: Merge tag 'upstream/1.2.1'

[Hugo Lefeuvre]

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

hle pushed a commit to branch master
in repository python-slugify.

commit 717496e8586702edca06e7187e00614fae45ecc5
Merge: b7410ad 8a4c2c8
Author: Hugo Lefeuvre <hle at debian.org>
Date:   Sat Sep 3 16:24:41 2016 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 .travis.yml         |  6 ++++--
 CHANGELOG.md        |  6 ++++++
 LICENSE             | 21 +++++++++++++++++++++
 LICENSE.md          | 28 ----------------------------
 MANIFEST.in         |  3 +++
 README.md           |  4 +---
 pep8.sh             |  7 ++-----
 setup.py            |  5 +++--
 slugify/__init__.py |  2 +-
 slugify/slugify.py  |  6 +++---
 test.py             | 13 +++++++++++++
 11 files changed, 57 insertions(+), 44 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-slugify.git