[pyosmium] 02/07: Merge tag 'upstream/2.11.0'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyosmium.

commit 2b5547296111164c611dc00a2329b1c91677aa92
Merge: c5ae8e0 b738812
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 15 21:44:51 2017 +0100

    Merge tag 'upstream/2.11.0'
    
    Upstream version 2.11.0

 CHANGELOG.md      | 13 +++++++++++--
 doc/conf.py       |  2 +-
 doc/ref_geom.rst  |  1 +
 lib/osm.cc        |  3 ++-
 osmium/version.py |  6 +++---
 5 files changed, 18 insertions(+), 7 deletions(-)

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