From: Quanah Gibson-Mount Date: Mon, 25 Aug 2014 22:07:47 +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~34 X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=93177bb6f34304e522ecc6aa8e91fd300279f7e6 Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- 93177bb6f34304e522ecc6aa8e91fd300279f7e6