From: Howard Chu <hyc@openldap.org>
Date: Sat, 21 Jan 2012 16:29:03 +0000 (-0800)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1072
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d13ef7e42f1514dd99878835a13a700da4f4b69;p=thirdparty%2Fopenldap.git

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

7d13ef7e42f1514dd99878835a13a700da4f4b69