[cpl-plugin-kmos] 02/02: 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 c4188842fabfe3f54d5b15bd5c17f617c738075e
Merge: f89b17d 3d6a148
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 11:40:17 2015 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control

 debian/README.Debian.in | 2 +-
 debian/README.Source    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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