[clfft] 17/50: Merge remote-tracking branch 'origin/debian' into debian

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.

commit cb6f63d50ca3e129a9f19801731eac6480ffdcaa
Merge: 3d7a286 b50cb49
Author: Jerome Kieffer <jerome.kieffer at terre-adelie.org>
Date:   Mon Apr 20 22:08:07 2015 +0200

    Merge remote-tracking branch 'origin/debian' into debian
    
    Conflicts:
    	debian/control

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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