From: Howard Chu <hyc@openldap.org>
Date: Wed, 12 Dec 2012 00:01:27 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~763
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c1b5ca0c4cc7da98beff036c0ab54042fe63899;p=thirdparty%2Fopenldap.git

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

1c1b5ca0c4cc7da98beff036c0ab54042fe63899