4 commits

Author	SHA1	Message	Date
Mike Pritchard	76918e1ad4	Merge to resolve conflicts with file 3.22 merge.	1997-03-18 19:37:41 +00:00
Mike Pritchard	a0f4ffca81	Merged changes to resolve conflicts with file 3.19 import.	1996-01-23 12:40:36 +00:00
Poul-Henning Kamp	eebb154304	Sanitize the PGP strings a bit.	1995-08-03 07:11:45 +00:00
Geoff Rehmet	c7510038dc	Bring in file 3.14 by Ian Darwin (and Christos Zoulas) ... The following files were moved to different names: - file.man -> file.1 - magic.man -> magic.5 The following file was removed: - Magdir/Makefile	1994-09-03 19:16:28 +00:00