tree a29c8f8f002919884d2dadd93d2e647b77292888
parent 697ca3783add1c8fa406d60f7821ab6db7c1bfec
parent c80d8fec81c3f9530ed07f83bc09fd73629522cd
author David Pursehouse <dpursehouse@collab.net> 1581999603 +0900
committer David Pursehouse <dpursehouse@collab.net> 1581999695 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set SSH default port to 22

Change-Id: I7fa99711a5938542eae97858ddc3b998efd3a374