From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 10 Jul 2014 18:38:40 +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=3da790c327bd09aa35bf3c0c7787efa44fcbda26;p=openldap

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

3da790c327bd09aa35bf3c0c7787efa44fcbda26