From: Quanah Gibson-Mount Date: Fri, 13 Jun 2014 17:53:24 +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~132 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a26706d135b06f9c70a6ea90ddcff9c3a49f8c15;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- a26706d135b06f9c70a6ea90ddcff9c3a49f8c15