[med-svn] [salmon] 03/04: Merge tag 'upstream/0.4.2+ds1'

[Michael Crusoe]

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

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

commit 7729512c6ed14018d7654b28a7d6b4c27cf3e8d4
Merge: eb10dee b6b142a
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Sat Jan 30 00:07:38 2016 -0800

    Merge tag 'upstream/0.4.2+ds1'
    
    Upstream version 0.4.2+ds1

 include/CollapsedIterativeOptimizer.hpp.bak | 2069 ---------------------------
 src/SalmonQuantify.cpp.bak                  | 1314 -----------------
 2 files changed, 3383 deletions(-)

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