[med-svn] [fastaq] 05/06: Merge branch 'upstream' of git+ssh://git.debian.org/git/debian-med/fastaq

[Jorge Soares]

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

jssoares-guest pushed a commit to branch master
in repository fastaq.

commit e2bcdfeec20bb2b0ad2c4056ab5edbc39c4232ff
Merge: 037b3fb 18a80b9
Author: Jorge Soares <j.s.soares at gmail.com>
Date:   Wed Oct 8 14:55:53 2014 +0100

    Merge branch 'upstream' of git+ssh://git.debian.org/git/debian-med/fastaq
    
    Merging the mess


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