commit 4a36e7f637420d9740386f247b936a254567dd14 Merge: 1fe8db0 b2fc1a8 Author: Peter Avalos <pavalos at dragonflybsd.org> Date: Sat Jun 7 09:25:39 2014 -0700 Merge branch 'vendor/TNFTP' Summary of changes: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4a36e7f637420d9740386f247b936a254567dd14 -- DragonFly BSD source repository