[cpl-plugin-xsh] 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-xsh.

commit 2c1c403147f61f16d097ad3663e5ed07c4817ec2
Merge: 3c82e2f c33c388
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 12:16:04 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-xsh.git