From: Howard Chu <hyc@openldap.org>
Date: Tue, 30 Jul 2013 19:51:54 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~628
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d534e1149505c44f6ff2c0631e56c1c11d687c5d;p=thirdparty%2Fopenldap.git

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

d534e1149505c44f6ff2c0631e56c1c11d687c5d