From: Quanah Gibson-Mount Date: Tue, 10 Nov 2015 21:58:53 +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=0f1d4f14115cc067bf21fa435097ac423ab30f81;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 0f1d4f14115cc067bf21fa435097ac423ab30f81