From: Quanah Gibson-Mount Date: Fri, 9 Aug 2013 15:49:33 +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~12 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d63e46d29da2d3c7c526b358a9f760aa87a73c5b;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- d63e46d29da2d3c7c526b358a9f760aa87a73c5b