From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Wed, 11 Jul 2012 07:07:04 +0000 (-0700)
Subject: Merge branch 'vendor/TNFTP'
X-Git-Tag: v3.2.0~617
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/a78853d5175ec736deede808ffc6c1114342c42f

Merge branch 'vendor/TNFTP'
---

a78853d5175ec736deede808ffc6c1114342c42f