[mapcache] 07/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 a68f777cf6b63341d0b0061914f30acae1823360
Merge: c73bc94 31cbed1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 21 22:42:13 2013 +0200

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

 debian/rules | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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