[mapserver] 34/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 934f3a9993a1234f973fdf38b1dad378d216e44c
Merge: 6b433d4 083baef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jul 22 20:25:40 2013 +0200

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

 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)


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