[med-svn] [circlator] 02/06: Merge tag 'upstream/1.2.1'

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository circlator.

commit 25f2238368c294e4ba3b187491791f2fe72440c7
Merge: 4065b8c 03b0ae8
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Sat Apr 23 20:35:33 2016 -0700

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 circlator/__init__.py        |  9 +++++++++
 circlator/bamfilter.py       | 20 +++++++++++++++++++-
 circlator/common.py          |  2 --
 circlator/external_progs.py  | 10 ++++------
 circlator/tasks/all.py       | 23 +++++++++++++++++++++--
 circlator/tasks/bam2reads.py |  2 ++
 circlator/tasks/progcheck.py |  5 ++---
 circlator/tasks/version.py   |  3 ++-
 circlator/versions.py        | 40 ++++++++++++++++++++++++++++++++++++++++
 setup.py                     |  8 ++++----
 10 files changed, 103 insertions(+), 19 deletions(-)

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