[med-svn] [camitk] 08/08: Merge branch 'experimental'

[Emmanuel Promayon]

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

promayon-guest pushed a commit to branch master
in repository camitk.

commit cbca2c855c5e3e47ce03328a65d3f3d7d92d5cbe
Merge: a53eced e7da0df
Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
Date:   Tue Apr 26 21:36:33 2016 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/changelog
    	debian/control


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/camitk.git