From: Howard Chu <hyc@openldap.org>
Date: Fri, 17 May 2013 00:23:29 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~661
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ba27410aeae0389c6eda03ca9043e2f352bb9a3;p=thirdparty%2Fopenldap.git

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

5ba27410aeae0389c6eda03ca9043e2f352bb9a3