[cpl-plugin-giraf] 03/03: Merge branch 'debian-template' 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-giraf.

commit 13f2ef988b86e57800ce20feb11f226c20e366f5
Merge: 97a8c91 e1d879b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jul 8 09:45:42 2014 +0200

    Merge branch 'debian-template' into debian

 debian/patches/fix_test_fail.patch | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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