[cpl-plugin-fors] 02/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-fors.

commit fb69005ab1e48255d52dd89ad4d12883c88aa0cd
Merge: 0a22ce6 e081daa
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed May 6 09:39:07 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-fors.git