From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 1 Feb 2013 00:46:55 +0000 (-0800)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~718
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc4e47a5a424de154c6a99c9313ccef7532f5ef8;p=thirdparty%2Fopenldap.git

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

bc4e47a5a424de154c6a99c9313ccef7532f5ef8