[med-svn] [jellyfish1] 04/12: Merge tag 'upstream/2.2.1'

[Andreas Tille]

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

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

commit 9c87425988861d27358e3769d6406eb800c9b02d
Merge: b36cc95 8daf559
Author: Charles Plessy <plessy at debian.org>
Date:   Wed Jun 17 18:06:00 2015 +0900

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1
    
    # gpg: Signature made Wed 17 Jun 2015 18:05:56 JST using RSA key ID B3443334
    # gpg: Good signature from "Charles Plessy <plessy at riken.jp>"

 configure.ac            | 2 +-
 swig/Makefile.am        | 6 +++---
 swig/python/__init__.py | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

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