From: Howard Chu <hyc@openldap.org>
Date: Thu, 18 Jul 2013 22:25:29 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~637
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfa993c14fc5abeb51098a992e0e5df74451b2e4;p=thirdparty%2Fopenldap.git

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

dfa993c14fc5abeb51098a992e0e5df74451b2e4