[mapserver] 14/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 38203c45849440ab52bd9b94a8babad72cc101ac
Merge: 041b47f 4299666
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 19 19:29:53 2013 +0200

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

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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