From: Quanah Gibson-Mount Date: Sat, 14 Jan 2017 19:46:23 +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=2ef0ef1825bd746035f2d4959614eaf8e7ad27ef;hp=-c;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 2ef0ef1825bd746035f2d4959614eaf8e7ad27ef