From: Howard Chu <hyc@openldap.org>
Date: Mon, 9 Sep 2013 15:30:52 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~573
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=057b2bab20de4a654f723bbea3fe2e6d76f1777d;p=thirdparty%2Fopenldap.git

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

057b2bab20de4a654f723bbea3fe2e6d76f1777d