Merge in all devel changes since 2.0-alpha2.

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index ea961e7c24214709f7920ca86855cf5280812b65..5450dd0d1d1307fee1eb6d3a6f1bcb5f6bc08537 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,29 @@
-Copyright (c) 1992-1996 Regents of the University of Michigan.
+Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+All rights reserved.
+
+Redistribution and use in source and binary forms are permitted only
+as authorized by the OpenLDAP Public License.  A copy of this
+license is available at http://www.OpenLDAP.org/license.html or
+in file LICENSE in the top-level directory of the distribution.
+
+Individual files and/or contributed packages may be copyright by
+other parties and use subject to additional restrictions.
+
+This work is derived from the University of Michigan LDAP v3.3
+distribution.  Information concerning is available at
+    http://www.umich.edu/~dirsvcs/ldap/ldap.html.
+
+This work also contains materials derived from public sources.
+
+Additional Information about OpenLDAP can be obtained at:
+    http://www.openldap.org/
+
+or by sending e-mail to:
+    info@OpenLDAP.org
+
+---
+
+Portions Copyright (c) 1992-1996 Regents of the University of Michigan.

 All rights reserved.
 
 Redistribution and use in source and binary forms are permitted
 All rights reserved.
 
 Redistribution and use in source and binary forms are permitted