[cpl-plugin-fors] 09/09: Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/cpl-plugin-fors into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-fors.

commit 5506557e06329af29f4117fc83bb58d7f7334ce8
Merge: ba65f36 d6b1c74
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Oct 26 14:48:20 2013 +0200

    Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/cpl-plugin-fors into debian
    
    Conflicts:
    	debian/repackage.sh


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-fors.git