From: Quanah Gibson-Mount Date: Tue, 30 Jul 2013 20:46:52 +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~19 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4ee8cc4e6306324370d3c4ec8ceb5a02792b4fd4;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- 4ee8cc4e6306324370d3c4ec8ceb5a02792b4fd4