[pyosmium] 02/08: Merge tag 'upstream/2.2.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyosmium.

commit 28cd15f435ce712b1bd6b2186b7162e0e899cd5f
Merge: c6ff8f4 758d381
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 4 16:50:51 2015 +0200

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0

 CHANGELOG.md    | 27 +++++++++++++++++++++++++++
 README.md       |  2 +-
 doc/conf.py     |  4 ++--
 setup.py        |  2 +-
 test/test_io.py |  2 +-
 5 files changed, 32 insertions(+), 5 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyosmium.git