[Python-modules-commits] [humanfriendly] 02/03: Merge tag 'upstream/3.2'

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository humanfriendly.

commit 48913e83ad03856143c43ab340803ef9fe0213d5
Merge: 7250ee0 3dc81ec
Author: W. Martin Borgert <debacle at debian.org>
Date:   Tue May 30 11:02:58 2017 +0200

    Merge tag 'upstream/3.2'

 PKG-INFO                        | 15 ++++---
 README.rst                      | 10 ++---
 humanfriendly.egg-info/PKG-INFO | 15 ++++---
 humanfriendly/__init__.py       | 32 ++++++++++-----
 humanfriendly/cli.py            | 24 ++++++------
 humanfriendly/prompts.py        |  7 +++-
 humanfriendly/terminal.py       | 87 +++++++++++++++++++++++++++++++----------
 humanfriendly/tests.py          | 45 ++++++++++-----------
 humanfriendly/usage.py          |  8 ++--
 setup.cfg                       |  1 -
 setup.py                        |  5 ++-
 11 files changed, 157 insertions(+), 92 deletions(-)

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