From: Howard Chu <hyc@openldap.org>
Date: Wed, 6 Mar 2013 23:50:47 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~695
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8289ac3b5ccbb2c7bfbadfed39d3042f91be9ecd;p=thirdparty%2Fopenldap.git

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

8289ac3b5ccbb2c7bfbadfed39d3042f91be9ecd