[mapproxy] 01/02: Merge tag 'debian/1.10.4-1' into stretch-backports

[Bas Couwenberg]

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

sebastic pushed a commit to branch stretch-backports
in repository mapproxy.

commit c26c397c87a19580dd432897fdda685c01065109
Merge: 9130998 3bbf7c2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 23 07:54:17 2017 +0200

    Merge tag 'debian/1.10.4-1' into stretch-backports

 CHANGES.txt              | 11 +++++++++++
 debian/changelog         |  6 ++++++
 doc/conf.py              |  2 +-
 mapproxy/service/demo.py | 18 +++++++++++-------
 setup.py                 |  2 +-
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 3e7ac27,f214ab5..19995fa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ mapproxy (1.10.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 17 Aug 2017 18:21:53 +0200
+ 
 +mapproxy (1.10.3-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 13 Jul 2017 07:20:05 +0200
 +
  mapproxy (1.10.3-1) unstable; urgency=medium
  
    * New upstream release.

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