Merging in changes from HEAD. (c5266fee) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

APACHE_1_2_X/KEYS

+16 −0

Original line number	Diff line number	Diff line
		@@ -169,3 +169,19 @@ tCBDaHVjayBNdXJja28gPGNodWNrQHRvcHNhaWwub3JnPg==
		=vUdL
		-----END PGP PUBLIC KEY BLOCK-----

		Type Bits/KeyID Date User ID
		pub 1024/26BB437D 1997/04/28 Ralf S. Engelschall <rse@engelschall.com>

		-----BEGIN PGP PUBLIC KEY BLOCK-----
		Version: 2.6.3ia

		mQCNAzNko/QAAAEEANZ2kpN/oMkz4tqzxvKPZws/XwsD0Y+E5/y7P2DIw4uHS/4N
		syQbgkdrZhPBlXDv68DQioHXWsb904qyr7iZB1LC5ItK9MgqlK+Z2mvPqsGbHM8J
		+oYib8kf2zJ6HvrYrP7NYB0tN9YYum2ICtx+hIi6aKGXdB1ATA5erwYmu0N9AAUR
		tClSYWxmIFMuIEVuZ2Vsc2NoYWxsIDxyc2VAZW5nZWxzY2hhbGwuY29tPokAlQMF
		EDNko/QOXq8GJrtDfQEBKVoD/2K/+4pcwhxok+FkuLwC5Pnuh/1oeOYHiKYwx0Z3
		p09RLvDtNldr6VD+aL9JltxdPTARzZ8M50UqoF9jMr25GifheFYhilww41OVZA3e
		cLXlLgda1+t0vWs3Eg/i2b0arQQDaIq7PeRdjdEDgwnG4xBaqaAqfgxwOXJ+LPWF
		hiXZ
		=K7lL
		-----END PGP PUBLIC KEY BLOCK-----

+4 −4

Original line number	Diff line number	Diff line
		@@ -62,12 +62,12 @@ The Latest Version

		Details of the latest version are in the apache project page (above).

		Licencing
		Licensing
		---------

		Please see the file called LICENSE.

		Acknowledgements
		Acknowledgments
		----------------

		We wish to acknowledge the following copyrighted works that make up
		@@ -78,8 +78,8 @@ Supercomputing Applications at the University of Illinois at
		Urbana-Champaign.

		This software contains code derived from the RSA Data Security Inc. MD5
		Message-Diest Algorithm, including various modifications by Spyglass Inc.,
		Caregie Mellon University, and Bell Communications Research, Inc.
		Message-Digest Algorithm, including various modifications by Spyglass Inc.,
		Carnegie Mellon University, and Bell Communications Research, Inc.
		(Bellcore).

		This package contains software written and copyrighted by Henry Spencer.