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

[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 a1f83440efbeb4ae92f5b192ee4d2bad965c7e65
Merge: 8b9806a ff96bf3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Nov 16 18:46:48 2016 +0100

    Merge tag 'upstream/2.10.2'
    
    Upstream version 2.10.2

 .travis.yml                  |  1 +
 CHANGELOG.md                 | 19 ++++++++++
 MANIFEST.in                  |  6 +++
 README.rst                   | 55 +++++++++++++++++++++++++++
 doc/conf.py                  | 13 ++++++-
 doc/intro.rst                | 12 +++---
 lib/generic_writer.hpp       | 10 ++---
 lib/io.cc                    |  3 ++
 lib/osmium.cc                |  2 +-
 osmium/replication/server.py | 12 +++---
 osmium/version.py            | 11 ++++++
 setup.py                     | 89 ++++++++++++++++++++++++++++++++++++++++----
 test/test_io.py              |  2 +
 13 files changed, 207 insertions(+), 28 deletions(-)

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