From: Quanah Gibson-Mount Date: Tue, 24 Jun 2014 18:46:30 +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~128 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d800cd71fe67bb5ee9e10867db2442da30f0d9d7;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- d800cd71fe67bb5ee9e10867db2442da30f0d9d7