Merge branch 'ssh-based-android-client' of ssh://git.code.sf.net/p/sshout/android-client-code into ssh-based-android-client