From: Quanah Gibson-Mount Date: Tue, 24 Jun 2014 18:46:18 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a2d11eeffb9593a5cdb54729f8d3cbf2db979d92;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5 --- a2d11eeffb9593a5cdb54729f8d3cbf2db979d92