From: Howard Chu <hyc@openldap.org>
Date: Fri, 30 Nov 2012 20:33:18 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~784
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e86d485dd4c99b3469aa40fec19994894b3463;p=thirdparty%2Fopenldap.git

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

d0e86d485dd4c99b3469aa40fec19994894b3463