From: Quanah Gibson-Mount Date: Fri, 29 Jan 2016 19:32:44 +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=4cbce492d2c588064966c86c9841250719a4226f;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 4cbce492d2c588064966c86c9841250719a4226f