From: Quanah Gibson-Mount Date: Fri, 10 May 2013 20:31:04 +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~68 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=914253c5635165f60f6bf510b7f1b90f73a4033a;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- 914253c5635165f60f6bf510b7f1b90f73a4033a