[mapserver] 02/05: Merge tag 'upstream/7.0.3'

[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 3801b8be5534ef4d7051436f69dbcd67289b84d8
Merge: 331e91d 7bf4afe
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Dec 5 21:22:56 2016 +0100

    Merge tag 'upstream/7.0.3'
    
    Upstream version 7.0.3

 CMakeLists.txt               |    4 +-
 README                       |    3 +-
 README.WIN32                 |    2 +-
 cmake/FindICONV.cmake        |    2 +-
 cmake/FindPHP5.cmake         |   29 +-
 fontcache.c                  |    6 +
 maplayer.c                   |   29 +-
 maplexer.c                   | 2387 +++++++++++++++++++++---------------------
 maplexer.l                   |    2 +-
 mapmssql2008.c               |  158 ++-
 mapogcfilter.c               |   65 +-
 mapogcfilter.h               |    2 +
 mapogcfiltercommon.c         |   42 +-
 mapogr.cpp                   |  614 ++++++++---
 mappostgis.c                 |   10 +-
 mapquery.c                   |    4 +-
 mapscript/csharp/csmodule.i  |    6 +
 mapscript/php/CMakeLists.txt |   10 +-
 mapscript/php/error.c        |   11 +
 mapscript/php/owsrequest.c   |    5 +-
 mapserv.c                    |    2 +
 mapserver.h                  |    9 +-
 maputfgrid.cpp               |    8 +-
 mapwfs.c                     |   14 +-
 24 files changed, 2032 insertions(+), 1392 deletions(-)

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