From: Quanah Gibson-Mount Date: Wed, 31 Jul 2013 17:13:12 +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~18 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aba681fa807c526a01afff98d2bf2c7c4b241c78;p=openldap Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 --- aba681fa807c526a01afff98d2bf2c7c4b241c78