[cpl-plugin-xsh] 03/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 3c82e2f198e6556efeb9f02c870d04e457f2df09
Merge: 6053f48 3d6a148
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 11:44:49 2015 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control

 debian/README.Debian.in |  2 +-
 debian/README.Source    |  2 +-
 debian/repackage.sh     | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

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