[cpl-plugin-hawki] 04/04: 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-hawki.

commit 71d5bc0bf58bdf0679c9585c992c70ed44002d98
Merge: c889d6f c33c388
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 12:03:05 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/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-hawki.git