[mapproxy] 02/04: Merge tag 'upstream/1.10.1'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapproxy.

commit 864c769fc4768315135814307af195644dc56c6a
Merge: 7a62811 7469325
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jun 6 14:19:41 2017 +0200

    Merge tag 'upstream/1.10.1'
    
    Upstream version 1.10.1

 CHANGES.txt                  |  9 +++++++++
 doc/conf.py                  |  2 +-
 mapproxy/compat/itertools.py |  2 ++
 mapproxy/util/ext/serving.py | 38 +++-----------------------------------
 mapproxy/util/geom.py        |  6 ++++--
 setup.py                     |  2 +-
 6 files changed, 20 insertions(+), 39 deletions(-)

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