[med-svn] [cnrun] 02/02: Merge branch 'WIP' of ssh://git.debian.org/git/debian-med/cnrun into WIP

[andrei zavada]

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

hmmr-guest pushed a commit to branch WIP
in repository cnrun.

commit feabc20b1fedc543a36e53d82d809696211c173e
Merge: adcd787 0321539
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Wed Nov 9 19:24:10 2016 +0200

    Merge branch 'WIP' of ssh://git.debian.org/git/debian-med/cnrun into WIP
    
    # Conflicts:
    #	debian/control


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