[cpl-plugin-fors] 35/40: Merge branch 'debian-template' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-fors.

commit 8f03eb45b13725b162f3d642d36520141de1c701
Merge: ae8f8b2 f89284f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 18 18:50:06 2013 +0200

    Merge branch 'debian-template' into debian

 debian/cpl-plugin-calib.install.in  |    2 +-
 debian/cpl-plugin-calib.postinst.in |    2 +-
 debian/cpl-plugin-calib.prerm.in    |    2 +-
 debian/cpl-plugin.install.in        |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

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