From: Howard Chu <hyc@openldap.org>
Date: Fri, 5 Apr 2013 10:04:31 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~680
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55d91653fdb8cb82bbdc6f371ec5e5af1d33bbc9;p=thirdparty%2Fopenldap.git

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

55d91653fdb8cb82bbdc6f371ec5e5af1d33bbc9