[med-svn] [hyphy] 02/04: Merge tag 'upstream/2.2.6+dfsg'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository hyphy.

commit 4273c8cd716e50987177eca804ce19aad6e8911b
Merge: 104a51d 04ec654
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 22 17:00:50 2015 +0200

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

 .gitattributes                                         | 1 +
 res/SubstitutionModels/Codon/MG94_REV_3x4.mdl copy     | 0
 res/TemplateBatchFiles/BranchSiteREL.bf                | 4 ++--
 res/TemplateBatchFiles/PairwiseDNDS.bf                 | 0
 res/TemplateBatchFiles/QuickSelectionDetectionMF.bf    | 3 ++-
 res/TemplateBatchFiles/dNdSDistributionComparisonMF.bf | 0
 src/lib/setup.py                                       | 6 ++++--
 7 files changed, 9 insertions(+), 5 deletions(-)

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