[Debian-astro-commits] [cpl-plugin-template] 59/81: Merge branch 'debian-template' into debian

[Ole Streicher]

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

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

commit 56551c33ea18f6c77cf0facec10f5664d3c0595c
Merge: 02bb42c e1d879b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jul 3 17:59:00 2014 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/patches/fix_test_fail.patch


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