From: Quanah Gibson-Mount Date: Wed, 4 Nov 2015 18:26:13 +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=303ece570b5e6864dcf69ced0e94b5814b0aac22;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 303ece570b5e6864dcf69ced0e94b5814b0aac22