pftp3 -> pftp
Merge branch 'master' of ssh.github.com:sueswe/miniature-octo-tyrion