[mapcache] 35/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 8f91147395dd197174d7260778ea88752489561f
Merge: 36ac21c 3fe3b23
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 20 14:39:06 2013 +0200

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

 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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