[Debian-astro-commits] [cpl-plugin-template] 74/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 4d9c82f470ec6b88cd7182d7672a2ede07290171
Merge: bd73e52 e081daa
Author: Ole Streicher <olebole at debian.org>
Date:   Wed May 6 09:03:05 2015 +0200

    Merge branch 'debian-template' into debian

 debian/cpl-plugin-calib.postinst.in | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

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