[mapserver] 18/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 8f8b49de9d97874969788f4c673407dc17eb88e6
Merge: 38203c4 7256a8e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 19 19:37:30 2013 +0200

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

 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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