[med-svn] [fastaq] 06/06: Merge branch 'upstream'

[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 66a98b30b12c68d3ecd16e80eb49fd2e97d9b46c
Merge: e2bcdfe b79e7c4
Author: Jorge Soares <j.s.soares at gmail.com>
Date:   Wed Oct 8 14:57:36 2014 +0100

    Merge branch 'upstream'
    
    I don't know if I'm mergingnow.


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