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

[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 6105a693529c03faf63a8107bff6ce657364c585
Merge: 7ce2d8c 5b178b3
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Tue Jan 5 10:14:26 2016 +0000

    Merge tag 'upstream/3.11.1'
    
    Upstream version 3.11.1

 README.md                        |  2 +-
 pyfastaq/common.py               |  2 +-
 pyfastaq/sequences.py            | 24 +++++++++++++++++-------
 pyfastaq/tests/sequences_test.py |  6 ++++++
 scripts/fastaq                   |  2 +-
 setup.py                         |  2 +-
 6 files changed, 27 insertions(+), 11 deletions(-)

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