From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 18 Oct 2013 20:38:46 +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=30e1c38f80224eea03f29adaedcaef229044eb85;p=openldap

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

30e1c38f80224eea03f29adaedcaef229044eb85