[med-svn] [ariba] 02/03: Merge tag 'upstream/2.2.2+ds'

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository ariba.

commit 0c5fb99d6c95022535418048c61aa8777d6e0ab1
Merge: 2e64cc3 f67c28c
Author: Sascha Steinbiss <satta at debian.org>
Date:   Mon Aug 22 17:09:54 2016 +0000

    Merge tag 'upstream/2.2.2+ds'
    
    Upstream version 2.2.2+ds

 ariba/cdhit.py                                     | 24 ++++++++++---
 ariba/reference_data.py                            | 15 +++++----
 ariba/tests/cdhit_test.py                          | 39 ++++++++++++++++++++--
 ...it_test_run_get_clusters_from_dict_rename.in.fa |  6 ++++
 ariba/tests/reference_data_test.py                 | 34 ++++++++++++++++++-
 setup.py                                           |  2 +-
 6 files changed, 104 insertions(+), 16 deletions(-)

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