From: Howard Chu <hyc@openldap.org>
Date: Fri, 7 Dec 2012 20:28:25 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~769
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a9476822d509b95f64ed8d1b537c4579933d583;p=thirdparty%2Fopenldap.git

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

6a9476822d509b95f64ed8d1b537c4579933d583