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

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

ef3b4213ff3fb8dafe3477fc9006ca13b9f7d168