tree 4a5c119d06da8a9b6184c81eaec0841d8aad3a01
parent c9694da1c2715cee289288ec152f7bfa11c69fc2
parent 12c48938cd5294e78beb93521cb7c8059754cbaa
author David Pursehouse <dpursehouse@collab.net> 1490656582 +0900
committer David Pursehouse <dpursehouse@collab.net> 1490656587 +0900

Merge branch 'stable-2.14'

* stable-2.14:
  Bump Mina core to 2.0.16 and sshd to 1.4

Change-Id: I9184620c384325ae1ffc88c0ebf4ba0e009bc6d9