From: Quanah Gibson-Mount Date: Fri, 20 Jan 2017 01:04:46 +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=8e333efdf739f7cdba1a1d2451e0224cec1cc148;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 8e333efdf739f7cdba1a1d2451e0224cec1cc148