]> git.sur5r.net Git - openldap/commit
Fix merge conflicts between head and RE25
authorQuanah Gibson-Mount <quanah@openldap.org>
Tue, 18 Aug 2015 19:51:49 +0000 (14:51 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Tue, 18 Aug 2015 19:51:49 +0000 (14:51 -0500)
commitbcc9b4bd251eba7f23f5b4fe429631268e97d120
treeb20a3257c43c50eeccb50e185e52a3579badd3d1
parent964213e2a9d6d8d1c99159bdd4d71b1438744170
Fix merge conflicts between head and RE25
build/openldap.m4
configure