[med-svn] [ariba] 05/06: Merge tag 'upstream/2.6.1+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 e9b514af6c6a92290b3ff4ac28a622be46961291
Merge: d2bd53c f56815e
Author: Sascha Steinbiss <satta at debian.org>
Date:   Wed Dec 21 19:13:30 2016 +0000

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

 ariba/mlst_profile.py                                       |  5 ++---
 ...lst_profile_test.init_multiple_extra_columns.profile.tsv |  3 +++
 ariba/tests/mlst_profile_test.py                            | 13 +++++++++++++
 setup.py                                                    |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

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