From: Quanah Gibson-Mount Date: Sun, 11 Aug 2013 22:34:00 +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~7 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c216e1809971ac6c5b2b973501e0e8a766b77287;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- c216e1809971ac6c5b2b973501e0e8a766b77287