Update based upon latest changes imported from devel.

diff --git a/CHANGES b/CHANGES
index 46f4c69521b754fe7dba9243082c00a56bca0cf4..feafd9375f49ca896246c58451f5c7b1c3734c46 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,11 @@ OpenLDAP 2.0.x Engineering
        Fixed clients printf bugs
        Fixed -lldap SASL interoperability bug
        Fixed -lldap PF_LOCAL declaration/call bugs
+       Updated slurpd SASL support
+       Added slurpd TLS support
        Removed lint
+       Documentation
+               updated ldap_schema(3)
 
 OpenLDAP 2.0.3 Release
        Fixed -lldap KBIND typo (ITS#717)