From: Howard Chu <hyc@openldap.org>
Date: Wed, 9 Jan 2013 20:22:41 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~745
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8102d9d2df0d97b70f9d5d9e54e7a171975a6fee;p=thirdparty%2Fopenldap.git

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

8102d9d2df0d97b70f9d5d9e54e7a171975a6fee