[mapserver] 33/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 6b433d4f759633fe618231778f63c7335b3507ea
Merge: 8a70fbb 298ebff
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 20 06:05:53 2013 +0200

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

 debian/patches/hardening.patch | 18 ++++++++++--------
 debian/rules                   | 23 ++++++++++++++---------
 2 files changed, 24 insertions(+), 17 deletions(-)

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