[cpl-plugin-vimos] 02/02: 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-vimos.

commit af1e27a2e9bfc519914cf67d5b0480e081698c8e
Merge: 82799d3 c33c388
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 12:17:03 2015 +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-vimos.git