Merge branch 'STABLE-BRANCH-2-2' into master
authorNIIBE Yutaka <gniibe@fsij.org>
Fri, 26 Jan 2018 01:47:28 +0000 (10:47 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Fri, 26 Jan 2018 01:47:28 +0000 (10:47 +0900)
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
1  2 
agent/command-ssh.c
configure.ac

Simple merge
diff --cc configure.ac
Simple merge