[med-svn] [jellyfish] 06/07: Merge tag 'upstream/2.2.5' into test

[Michael Crusoe]

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

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

commit 92be8eb80d24a1d5612d829c1d98baed4fa4d71b
Merge: d4dd42a 1b0c92f
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Sat Mar 12 08:08:14 2016 -0800

    Merge tag 'upstream/2.2.5' into test
    
    Upstream version 2.2.5


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