git: Merge branch 'vendor/TNFTP'

[Peter Avalos]

commit 6645a7f0837352167745ac38fe9856a8228d7b09
Merge: 69d2955 a83a5d0
Author: Peter Avalos <pavalos at dragonflybsd.org>
Date:   Sat Apr 6 22:00:55 2013 -0700

    Merge branch 'vendor/TNFTP'

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/6645a7f0837352167745ac38fe9856a8228d7b09


-- 
DragonFly BSD source repository