git: Merge branch 'vendor/TNFTP'

[Peter Avalos]

commit 64da553dcc4e2219b24747ae452fa202861e0eac
Merge: edc31c02ebe95295a9b60aea01736576d0cfc383 c81ae005f0718115c830875ab441690c794583ae
Author: Peter Avalos <pavalos at dragonflybsd.org>
Date:   Sun Jan 8 12:43:07 2012 -0800

    Merge branch 'vendor/TNFTP'

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/64da553dcc4e2219b24747ae452fa202861e0eac


-- 
DragonFly BSD source repository