[med-svn] [jellyfish1] 02/12: Merge tag 'upstream/2.1.5'

[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 0cd80475d1396f878b9828541f0060aecac85d08
Merge: 3750540 e5b008d
Author: Charles Plessy <plessy at debian.org>
Date:   Wed Jun 17 18:05:33 2015 +0900

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

 configure.ac                         | 2 +-
 sub_commands/info_main_cmdline.yaggo | 6 ++----
 sub_commands/mem_main_cmdline.yaggo  | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

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