[Python-modules-commits] [usagestats] 02/04: Merge tag 'upstream/0.6' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository usagestats.

commit 5ec724d39ff39125fa9ec2756eeb838cf789a758
Merge: be83ba2 e05c8cc
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Apr 18 15:38:46 2017 +0100

    Merge tag 'upstream/0.6' into debian/master

 CHANGELOG.md                       |   7 +++
 PKG-INFO                           | 102 +++++++++++++++++++++++++++++++++++++
 README.rst                         |   2 +-
 appveyor.yml                       |  15 ------
 scripts/conda/conda.sh             |  94 ----------------------------------
 scripts/conda/usagestats/bld.bat   |   8 ---
 scripts/conda/usagestats/build.sh  |   9 ----
 scripts/conda/usagestats/meta.yaml |  58 ---------------------
 setup.cfg                          |   5 ++
 setup.py                           |   2 +-
 usagestats.py                      |  10 ++--
 11 files changed, 121 insertions(+), 191 deletions(-)

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