From: Quanah Gibson-Mount Date: Wed, 18 Jun 2014 21:27:27 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~129 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6fafcf8caf312dc544b2f565ec289f348d7a9781;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- 6fafcf8caf312dc544b2f565ec289f348d7a9781