[pyosmium] 02/05: Merge tag 'upstream/2.3.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 1ff7ffb059db8de3b4ee45e72b3d9405857811b3
Merge: 399db68 b11f697
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 18 16:02:43 2015 +0200

    Merge tag 'upstream/2.3.0'
    
    Upstream version 2.3.0

 CHANGELOG.md | 11 ++++++++++-
 doc/conf.py  |  4 ++--
 setup.py     |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

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