From: Howard Chu <hyc@openldap.org>
Date: Tue, 13 Aug 2013 18:36:50 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~611
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beca9bbb153ae03fb34acfdb57c53144ac2166fc;p=thirdparty%2Fopenldap.git

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

beca9bbb153ae03fb34acfdb57c53144ac2166fc