From: Howard Chu <hyc@openldap.org>
Date: Sat, 7 Jul 2012 01:03:06 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~896
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6b5abbfd20567116846ebc38f0005c429284c98;p=thirdparty%2Fopenldap.git

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

c6b5abbfd20567116846ebc38f0005c429284c98