[Debian-astro-commits] [cpl-plugin-template] 64/81: 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 46aa323c87ef77ba94b5a498a48f922f313337b2
Merge: 8aaff42 c33c388
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 12:15:21 2015 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control
    	debian/patches/fix_test_fail.patch

 debian/README.Debian.in            |  2 +-
 debian/README.Source               |  2 +-
 debian/patches/fix_test_fail.patch | 24 ++++++++++++++++++++++++
 debian/repackage.sh                | 14 ++++++++++----
 4 files changed, 36 insertions(+), 6 deletions(-)

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