]> 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, 20 Jan 2017 01:04:46 +0000 (17:04 -0800)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 20 Jan 2017 01:04:46 +0000 (17:04 -0800)
commit8e333efdf739f7cdba1a1d2451e0224cec1cc148
treee260f603e23bef6464883d95ef35118f1d6ee1a8
parent7ae6ec8b29432ef4a32aa7cea7a0c153096f6240
parent5497a7df8b79c517d33675cd0e0868e9e1f799ff
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5