[pyosmium] 03/08: Merge tag 'upstream/2.7.1'

[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 a78ba694a92c57e58e43eb84469440a0631bf4c5
Merge: fa820d2 54e7a8c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 1 13:44:04 2016 +0200

    Merge tag 'upstream/2.7.1'
    
    Upstream version 2.7.1

 .travis.yml                       |  21 ++++
 CHANGELOG.md                      |  16 ++-
 doc/conf.py                       |   4 +-
 examples/filter_coastlines.py     |   2 +-
 examples/osm_replication_stats.py |  72 +++++++++++++
 examples/osm_url_stats.py         |  41 ++++++++
 lib/generic_handler.hpp           |  32 ++++--
 lib/merged_input.hpp              |  74 +++++++++++++
 lib/osm.cc                        |   1 +
 lib/osmium.cc                     |  30 +++++-
 lib/replication.cc                |  45 ++++++++
 osmium/replication/__init__.py    |   1 +
 osmium/replication/server.py      | 211 ++++++++++++++++++++++++++++++++++++++
 setup.py                          |   4 +-
 14 files changed, 541 insertions(+), 13 deletions(-)

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