]> git.sur5r.net Git - openldap/commit
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Tue, 19 Jan 2016 00:22:18 +0000 (18:22 -0600)
committerQuanah Gibson-Mount <quanah@openldap.org>
Tue, 19 Jan 2016 00:22:18 +0000 (18:22 -0600)
commit385e524233c4e70ca71988756b7217c8039768ea
tree27fb6ed2f222bf49fd31a5be9e49ac2521896ed7
parent8ebd8a9576f8e1c1b5388a2621a0366157809059
parenteaee3b39ba58bf0630679a35e7be6062d8cbd78c
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5