From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 18 Jun 2014 21:27:06 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~141^2~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fed9370fae35b4aed29a5f8ab619c0b17a9e8cd7;p=thirdparty%2Fopenldap.git

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

fed9370fae35b4aed29a5f8ab619c0b17a9e8cd7