[mapserver] 39/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 3eaf6a44ac38bfba77f74e385a9c7c31b72eea5f
Merge: d16ee93 e959923
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 25 15:59:40 2013 +0200

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

 debian/rules | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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