From: Quanah Gibson-Mount Date: Fri, 16 Aug 2013 18:12:59 +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 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=177287bd34f07149425ffe980813d7e63e520a11;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- c8c7002e289a7934db8e70143053b5796fbef9a6