maclellant/SecureFileTransfer — pull request #1 by dbroaden92 (2014-03-24 00:48:06+00:00)
Title: Merging devin's-other-branch with master

Merging the changes made in devin's-other-branch with the master branch.