From: Howard Chu <hyc@openldap.org>
Date: Fri, 6 Sep 2013 19:54:02 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~593
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2851b22315ee55fe149b39464addf6e24ada1063;p=thirdparty%2Fopenldap.git

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

2851b22315ee55fe149b39464addf6e24ada1063