From: Howard Chu <hyc@openldap.org>
Date: Thu, 26 Jul 2012 15:43:57 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~881
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fe328dd518d02e8eea9f36068e13671c9cb8093;p=thirdparty%2Fopenldap.git

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

8fe328dd518d02e8eea9f36068e13671c9cb8093