From: Howard Chu <hyc@openldap.org>
Date: Tue, 11 Dec 2012 22:22:31 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~764
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bae86317e0e19fde4aa38fdad08de8d10e3fed6c;p=thirdparty%2Fopenldap.git

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

bae86317e0e19fde4aa38fdad08de8d10e3fed6c