From: Quanah Gibson-Mount Date: Fri, 5 Feb 2016 23:57:28 +0000 (-0600) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f01d3eef1a4759f2a8dcee0934e1df4ada567685;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- f01d3eef1a4759f2a8dcee0934e1df4ada567685