[Python-modules-commits] [python-pyotp] 02/02: Merge tag 'upstream/2.1.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-pyotp.

commit 496bac183e5a9e82e89dfb3a1c35ee090301c804
Merge: 39cbd2d 8714c54
Author: Hugo Lefeuvre <hle at debian.org>
Date:   Tue Jul 5 16:58:53 2016 +0200

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1

 PKG-INFO                        |  2 +-
 requirements.txt                |  1 +
 setup.py                        |  2 +-
 src/pyotp.egg-info/PKG-INFO     |  2 +-
 src/pyotp.egg-info/SOURCES.txt  |  1 +
 src/pyotp.egg-info/requires.txt |  1 +
 src/pyotp/__init__.py           |  3 ---
 src/pyotp/hotp.py               |  2 +-
 src/pyotp/otp.py                |  5 ++++-
 src/pyotp/totp.py               | 16 ++++++++++----
 src/pyotp/utils.py              |  5 ++++-
 test.py                         | 49 +++++++++++++++++++++++++++++------------
 12 files changed, 62 insertions(+), 27 deletions(-)

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