From: Howard Chu <hyc@openldap.org>
Date: Thu, 10 Jan 2013 10:59:39 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~744
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e250e052c3281d9c99b012037c00cb7da509c187;p=thirdparty%2Fopenldap.git

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

e250e052c3281d9c99b012037c00cb7da509c187