From: Howard Chu <hyc@openldap.org>
Date: Mon, 10 Dec 2012 20:22:30 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~768
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bf87500a3a417d912ced6260464e709293098e5;p=thirdparty%2Fopenldap.git

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

3bf87500a3a417d912ced6260464e709293098e5