From: Howard Chu <hyc@openldap.org>
Date: Wed, 1 May 2013 06:18:01 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~665
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=054812517f0099f489eb47fdb25f53396580c6a0;p=thirdparty%2Fopenldap.git

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

054812517f0099f489eb47fdb25f53396580c6a0