[cpl-plugin-kmos] 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-kmos.

commit 5e4d1b1267161946e8f5f056143b24c8c6b25ee5
Merge: 6812bbf e081daa
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed May 6 09:39:33 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-kmos.git