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

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

0521a7b3745cb346b7cd636a4fc144bb5a245cdc