[Debian-astro-commits] [cpl-plugin-template] 56/76: 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-template.

commit 7f1d9a901d11cadd0093dd0d437d945b1816d658
Merge: 02a36e9 c33c388
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 12:07:45 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-template.git