From: Howard Chu <hyc@openldap.org>
Date: Tue, 18 Sep 2012 19:37:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~824
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c264d70fbe2906b274057453cfbb6cf5d388c43e;p=thirdparty%2Fopenldap.git

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

c264d70fbe2906b274057453cfbb6cf5d388c43e