[mapcache] 28/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 mapcache.

commit 4d71e9631278f7a7874efe4e1818329e24e462ff
Merge: 7cb9167 f88e65b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 19 14:13:40 2013 +0200

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

 debian/control                             | 15 ++++++++++++++-
 debian/patches/fixwithmapserv.patch        |  3 +++
 debian/patches/includepath.patch           |  3 +++
 debian/patches/libmapcache_hardening.patch |  3 +++
 4 files changed, 23 insertions(+), 1 deletion(-)


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