commit a78853d5175ec736deede808ffc6c1114342c42f Merge: 99f62ae d2b5147 Author: Peter Avalos <pavalos at dragonflybsd.org> Date: Wed Jul 11 00:07:04 2012 -0700 Merge branch 'vendor/TNFTP' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/a78853d5175ec736deede808ffc6c1114342c42f -- DragonFly BSD source repository