[mapserver] 21/43: Merge branch 'jessie' into wheezy-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch wheezy-backports
in repository mapserver.

commit 5c2da3003d2f23c3d8078b484227b94e8f49ee21
Merge: 8f8b49d d3ce00f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 19 21:47:43 2013 +0200

    Merge branch 'jessie' into wheezy-backports
    
    Conflicts:
    	debian/control
    	debian/rules

 debian/rules | 183 ++++++++++++++++++-----------------------------------------
 1 file changed, 55 insertions(+), 128 deletions(-)

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