[mapserver] 02/07: Merge tag 'upstream/7.0.6'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapserver.

commit 3ca9b200284c94b2bb73a1f3f17e006fb04b8935
Merge: 9a143b6 85b8750
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 21 20:53:54 2017 +0200

    Merge tag 'upstream/7.0.6'
    
    Upstream version 7.0.6

 CMakeLists.txt |  2 +-
 maplabel.c     |  1 +
 mapmssql2008.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 mapogr.cpp     | 19 ++++++++++++-
 mapquery.c     |  4 ++-
 maprendering.c | 35 ++++++++++++++++++++++-
 mapresample.c  |  7 ++++-
 maputil.c      |  2 ++
 8 files changed, 149 insertions(+), 9 deletions(-)

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