From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 7 Jan 2014 23:44:53 +0000 (-0600)
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=37a120731ee1cfd426c548af387e64093ecb852f;p=openldap

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

37a120731ee1cfd426c548af387e64093ecb852f