[med-svn] [psortb] 05/06: Merge tag 'upstream/3.0.4+dfsg'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository psortb.

commit 4ca2c94dbf4be74624ba8a7819095ce24e374d6d
Merge: 55d2328 ec70b2d
Author: Andreas Tille <tille at debian.org>
Date:   Sun Apr 30 07:43:01 2017 +0200

    Merge tag 'upstream/3.0.4+dfsg'
    
    Upstream version 3.0.4+dfsg

 psort/conf/analysis/subloc/archaea/Cellwall/CVS/Entries         | 3 ---
 psort/conf/analysis/subloc/archaea/Cellwall/CVS/Repository      | 1 -
 psort/conf/analysis/subloc/archaea/Cellwall/CVS/Root            | 1 -
 psort/conf/analysis/subloc/archaea/Cytoplasmic/CVS/Entries      | 3 ---
 psort/conf/analysis/subloc/archaea/Cytoplasmic/CVS/Repository   | 1 -
 psort/conf/analysis/subloc/archaea/Cytoplasmic/CVS/Root         | 1 -
 psort/conf/analysis/subloc/archaea/Extracellular/CVS/Entries    | 3 ---
 psort/conf/analysis/subloc/archaea/Extracellular/CVS/Repository | 1 -
 psort/conf/analysis/subloc/archaea/Extracellular/CVS/Root       | 1 -
 psort/conf/analysis/subloc/archaea/Membrane/CVS/Entries         | 3 ---
 psort/conf/analysis/subloc/archaea/Membrane/CVS/Repository      | 1 -
 psort/conf/analysis/subloc/archaea/Membrane/CVS/Root            | 1 -
 12 files changed, 20 deletions(-)

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