[med-svn] [fastaq] 03/03: Merge tag 'upstream/3.11.0'

[Sascha Steinbiss]

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

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

commit 7ce2d8cb8f190921fc8ee0804f8615eb6d67f575
Merge: bca96a6 e83fffb
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Mon Nov 30 19:09:06 2015 +0000

    Merge tag 'upstream/3.11.0'
    
    Upstream version 3.11.0

 pyfastaq/common.py                                             |  2 +-
 pyfastaq/runners/interleave.py                                 | 10 +++++++++-
 pyfastaq/tasks.py                                              |  9 ++++++++-
 .../tests/data/sequences_test_deinterleaved_no_suffixes_1.fa   |  4 ++++
 .../tests/data/sequences_test_deinterleaved_no_suffixes_2.fa   |  4 ++++
 .../tests/data/sequences_test_interleaved_with_suffixes.fa     |  8 ++++++++
 pyfastaq/tests/tasks_test.py                                   |  5 +++++
 setup.py                                                       |  2 +-
 8 files changed, 40 insertions(+), 4 deletions(-)

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