From: Howard Chu <hyc@openldap.org>
Date: Wed, 9 May 2012 19:13:05 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~941
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22bf5188a91d300453c4077eaa88af6b399ce7e9;p=thirdparty%2Fopenldap.git

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

22bf5188a91d300453c4077eaa88af6b399ce7e9