[med-svn] [bowtie2] 02/04: Merge tag 'upstream/2.2.5'

[Alex Mestiashvili]

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

malex-guest pushed a commit to branch master
in repository bowtie2.

commit 47481296aceb54bb39349012e8d49a6d7d07c026
Merge: 0d0c843 a6ae526
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Wed Mar 18 10:08:29 2015 +0100

    Merge tag 'upstream/2.2.5'
    
    Upstream version 2.2.5

 MANUAL             |  10 +--
 MANUAL.markdown    | 130 +++++++++++++--------------------
 Makefile           |  11 ++-
 NEWS               |  13 +++-
 VERSION            |   2 +-
 aligner_result.cpp |  10 +--
 bowtie2            |  32 +++++++--
 bt2_search.cpp     |   2 +-
 doc/manual.html    | 208 +++++++++++++++++++++--------------------------------
 pat.cpp            |   8 ++-
 10 files changed, 193 insertions(+), 233 deletions(-)

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