From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 1 Nov 2013 00:56:13 +0000 (-0700)
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=b46607bab6ec28cbc7f75dbd13ba4a77af417179;p=openldap

Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5
---

b46607bab6ec28cbc7f75dbd13ba4a77af417179