[med-svn] [trinityrnaseq] 02/03: Merge tag 'upstream/2.0.6+dfsg'

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository trinityrnaseq.

commit 0cc85d77a5592ab742a01c4c80ada4615f4ca5f9
Merge: e1b4347 7558f2f
Author: Michael R. Crusoe <mcrusoe at msu.edu>
Date:   Sun Mar 8 19:09:55 2015 -0400

    Merge tag 'upstream/2.0.6+dfsg'
    
    Upstream version 2.0.6+dfsg

 Butterfly/jar-in-jar-loader.zip                 | Bin 7269 -> 0 bytes
 Butterfly/src/src/PathExpressionComparator.java |   4 +-
 Inchworm/configure                              |   6 +-
 Inchworm/configure.ac                           |   6 +-
 Trinity                                         |  20 +--
 util/align_and_estimate_abundance.pl            |  51 +++++--
 util/misc/SRA_to_fastq.pl                       |  36 ++---
 util/misc/run_GSNAP.pl                          |  14 +-
 util/misc/run_HISAT.pl                          | 173 ++++++++++++++++++++++++
 9 files changed, 260 insertions(+), 50 deletions(-)

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