From: Howard Chu <hyc@openldap.org>
Date: Mon, 9 Apr 2012 12:19:41 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~966
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=321b0fa93e6a8841cba23fac8663802d2d17a8c7;p=thirdparty%2Fopenldap.git

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

321b0fa93e6a8841cba23fac8663802d2d17a8c7