Merge tnftp-20100108 from the vendor branch into head.

PR:		bin/112288 bin/120256 bin/129014 bin/145528
MFC after:	1 month

1 files changed, 0 insertions, 47 deletions

diff --git a/contrib/lukemftp/COPYING b/contrib/lukemftp/COPYING
deleted file mode 100644
index 31acb74..0000000
--- a/contrib/lukemftp/COPYING
+++ /dev/null
@@ -1,47 +0,0 @@
-Copyright 1999, 2000 Luke Mewburn <lukem@netbsd.org>.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-	This product includes software developed by Luke Mewburn.
-4. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This product also contains software developed by other people, and you
-are advised to read the various source files to read the full details
-of the other licenses. Those licenses also require the following
-acknowledgements:
-
-	This product includes software developed by the NetBSD Foundation,
-	Inc.  and its contributors. Those contributors include:
-		- Jaromir Dolecek
-		- Klaus Klein
-		- Luke Mewburn
-		- Jason R. Thorpe of the Numerical Aerospace Simulation
-		  Facility, NASA Ames Research Center.
-
-	This product includes software developed by the University of
-	California, Berkeley and its contributors. Those contributors include:
-		- Christos Zoulas of Cornell University.
-		- Guido van Rossum.
-
-	This product includes software developed by Christos Zoulas.
-