From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 5 Jun 2012 02:41:58 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~931
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f46f2e0bcc6b4eb3900c6686c26d7d3698a2255;p=thirdparty%2Fopenldap.git

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

3f46f2e0bcc6b4eb3900c6686c26d7d3698a2255