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

[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 38f5fd57f8a1fa00f800105409b9aefcec19f9da
Merge: 72490d9 919c901
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 7 15:55:13 2017 +0200

    Merge tag 'upstream/1.10.3'
    
    Upstream version 1.10.3

 CHANGES.txt                            |  9 +++++++++
 doc/conf.py                            |  2 +-
 mapproxy/image/mask.py                 |  3 +++
 mapproxy/image/transform.py            |  6 +++++-
 mapproxy/test/unit/test_conf_loader.py | 20 ++++++++++++++++++--
 mapproxy/util/geom.py                  |  3 +--
 setup.py                               |  2 +-
 7 files changed, 38 insertions(+), 7 deletions(-)

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