[med-svn] [fastaq] 02/04: Merge tag 'upstream/3.12.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 722dfd6df8023214054be6fdb133d0dfa1dcf70c
Merge: 0e1520e bc65258
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Wed Apr 20 09:32:27 2016 +0000

    Merge tag 'upstream/3.12.1'
    
    Upstream version 3.12.1

 pyfastaq/__init__.py        | 10 +++++++++-
 pyfastaq/common.py          |  1 -
 pyfastaq/runners/version.py |  4 ++--
 setup.py                    |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

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