From: Howard Chu <hyc@openldap.org>
Date: Mon, 8 Apr 2013 02:23:19 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~677
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1da5f1faf052e05c1a23b1663aed1d2cabca5008;p=thirdparty%2Fopenldap.git

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

1da5f1faf052e05c1a23b1663aed1d2cabca5008