[med-svn] [ariba] 02/03: Merge tag 'upstream/2.2.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 14ef5f3e7eb3b909de4953852a7ace85a3aa3a5c
Merge: 6604a45 548ed16
Author: Sascha Steinbiss <satta at debian.org>
Date:   Thu Aug 18 20:31:55 2016 +0000

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

 ariba/aln_to_metadata.py            | 4 ----
 ariba/tasks/aln2meta.py             | 2 +-
 ariba/tests/aln_to_metadata_test.py | 4 ++--
 scripts/ariba                       | 4 ++--
 setup.py                            | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

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