[python-cpl] 02/02: Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/python-cpl 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 python-cpl.

commit c234df7f548c2cd6244fbd9bd35e0285504dffc1
Merge: e1df794 e8adf3b
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Oct 9 15:47:38 2014 +0200

    Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/python-cpl into debian
    
    Conflicts:
    	debian/changelog

 debian/control | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


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