From: Quanah Gibson-Mount Date: Fri, 20 Jan 2017 19:42:14 +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=bf4868dba6636e6a20baa7645b6bb7f1b2db915a;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- bf4868dba6636e6a20baa7645b6bb7f1b2db915a