[med-svn] [jellyfish1] 04/06: Merge tag 'upstream/2.2.4'

[Andreas Tille]

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

tille pushed a commit to tag debian/2.2.4-1
in repository jellyfish1.

commit 1f0f697954e2fd5bd513525102e00805ac225c49
Merge: 37487e7 efe89cc
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 10 21:54:21 2015 +0100

    Merge tag 'upstream/2.2.4'
    
    Upstream version 2.2.4

 .gitmod                     |  1 +
 Makefile.am                 |  8 ++++--
 configure.ac                | 19 ++++----------
 m4/m4-ax_perl_ext.m4        |  6 ++++-
 m4/m4-ax_python_devel.m4    | 13 ++++++++--
 m4/m4-ax_ruby_ext.m4        | 33 +++++++++++++++++++------
 swig/Makefile.am            | 60 ++++++++++++++++++++++-----------------------
 swig/jellyfish.i            |  5 ++++
 swig/ruby/test_mer_file.rb  |  4 +--
 tests/swig_perl.sh          |  2 +-
 unit_tests/test_mer_heap.cc |  2 +-
 11 files changed, 91 insertions(+), 62 deletions(-)

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