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

commit ea0b5687dea2ae932d4aaf6cabe383119215c07c
Merge: 2220eb1 e081daa
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed May 6 09:40:08 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-vimos.git