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

[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 45ad7108f1d2e8954dcafdb38b3b4b4b47360e5f
Merge: cedd704 3ab01e6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 17 18:21:06 2017 +0200

    Merge tag 'upstream/1.10.4'
    
    Upstream version 1.10.4

 CHANGES.txt              | 11 +++++++++++
 doc/conf.py              |  2 +-
 mapproxy/service/demo.py | 18 +++++++++++-------
 setup.py                 |  2 +-
 4 files changed, 24 insertions(+), 9 deletions(-)

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