4a66c6c
Merge branch 'master' into RHEL-6
Merged and Committed by 
rmeggins
12 years ago
VERSION.sh
file modified
+1
-1
config.h.in
file modified
+6
-3
configure
file modified
+57
-11
configure.ac
file modified
+8
-9
ldap/admin/src/scripts/template-dn2rdn.in
file modified
+2
-9
ldap/servers/plugins/replication/windows_connection.c
file modified
+1
-1
ldap/servers/plugins/replication/windows_inc_protocol.c
file modified
+3
-0
ldap/servers/plugins/replication/windows_protocol_util.c
file modified
+18
-6
ldap/servers/plugins/replication/windows_tot_protocol.c
file modified
+8
-0
ldap/servers/slapd/back-ldbm/dbversion.c
file modified
+3
-1
ldap/servers/slapd/back-ldbm/ldif2ldbm.c
file modified
+9
-1
ldap/servers/slapd/slapi_counter.c
file modified
+5
-13