reflect latest merge from head

diff --git a/CHANGES b/CHANGES
index d5a1f950441b0f3bac60ae714361abc888276582..2344fec1f683de8283acfc88f1b0aa07083514e4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,10 +7,12 @@ OpenLDAP 2.1.9 Engineering
        Fixed slapd unix socket unlink bug (ITS#2157)
        Fixed slapd empty SASL cred bug
        Fixed slapd referral/alias normalization bug
-       Fixed slapd logging bugs (ITS#2170)
-       Fixed slapd rootdse entry_free bug (ITS#2172)
        Added slapd allow update_anon feature (ITS#2155)
        Added slapd authz stats logging feature (ITS#2165)
+       Fixed slapd logging bugs (ITS#2170)
+       Fixed slapd rootdse entry_free bug (ITS#2172)
+       Fixed slapd multimaster passwd bug (ITS#2176)
+       Fixed slapd bad acl DN bug (ITS#2196)
        Removed lint
        Build Environment
                Add subordinate referral test