]> git.sur5r.net Git - openldap/commit
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Fri, 7 Apr 2017 21:39:35 +0000 (14:39 -0700)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 7 Apr 2017 21:39:35 +0000 (14:39 -0700)
commitd85a1a326095e6098acd08c93232d734464371b4
tree713aec99b5cfcb1cabd46e03a7da68ee01d482de
parent2fe93270d4c70b4b535bc7d59a26b0b1e301f3e6
parentec5af7b5e73b26ad6d330a33f629c051b5b0334c
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5