[Python-modules-commits] [python-tzlocal] 03/04: Merge branch 'upstream'

[Edward Betts]

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

edward pushed a commit to branch master
in repository python-tzlocal.

commit cc2917e27f7100cd1e643e4473d3a5f6c42a54f4
Merge: 49e5a4c 5561ef5
Author: Edward Betts <edward at 4angle.com>
Date:   Fri Nov 18 12:45:13 2016 +0000

    Merge branch 'upstream'

 CHANGES.txt                                     |  6 +++++
 PKG-INFO                                        |  8 +++++-
 setup.py                                        |  2 +-
 tzlocal.egg-info/PKG-INFO                       |  8 +++++-
 tzlocal.egg-info/SOURCES.txt                    |  1 +
 tzlocal/test_data/vardbzoneinfo/var/db/zoneinfo |  1 +
 tzlocal/tests.py                                |  6 +++++
 tzlocal/unix.py                                 | 33 +++++++++++++------------
 8 files changed, 46 insertions(+), 19 deletions(-)

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