[mapproxy] 02/07: Merge tag 'upstream/1.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 mapproxy.

commit 4786e34619f87225507b918eb59fe34fcc050d1e
Merge: 58bb1de 51e7999
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 21 18:02:48 2017 +0200

    Merge tag 'upstream/1.10.2'
    
    Upstream version 1.10.2

 CHANGES.txt            | 7 +++++++
 doc/conf.py            | 2 +-
 mapproxy/cache/tile.py | 9 ++++++++-
 setup.py               | 2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

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