[cpl-plugin-xsh] 02/03: 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 7fd25d27d6c8277afa9b9066846c6f7956202e00
Merge: 74654df 8958524
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed May 6 13:50:26 2015 +0200

    Merge branch 'debian-template' into debian

 debian/tests/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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