From: Howard Chu <hyc@openldap.org>
Date: Mon, 23 Jul 2012 00:58:39 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~886
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=832f7de6ae6892559cf188033445a044e993326f;p=thirdparty%2Fopenldap.git

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

832f7de6ae6892559cf188033445a044e993326f