Merge branch 'master' of ssh://git.code.sf.net/p/sshout/daemon-code