From: Quanah Gibson-Mount Date: Tue, 28 Feb 2017 21:31:04 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ddff6026d53efdd1efadec0dd816156afaa3b069;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- ddff6026d53efdd1efadec0dd816156afaa3b069