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

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

c1bb7e7610086bfd8d649e02dec92a90cb90f311