From: Howard Chu <hyc@openldap.org>
Date: Tue, 30 Jul 2013 20:48:01 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~627
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d623dc9b3905c3a5d3dc3f4f312eaa38e82285b6;p=thirdparty%2Fopenldap.git

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

d623dc9b3905c3a5d3dc3f4f312eaa38e82285b6