From: Quanah Gibson-Mount Date: Wed, 1 May 2013 14:41:20 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 X-Git-Tag: OPENLDAP_REL_ENG_2_4_36~69 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e456f7f254bdd0115841bdb961322cc94fa366c2;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- e456f7f254bdd0115841bdb961322cc94fa366c2