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

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

f51efd4b0345baea1a9c977d0763292891c37436