From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Sat, 13 Sep 2014 21:24:58 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~141^2~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46331f0216c4de9fa3aa26273f18b5be2afa6e18;p=thirdparty%2Fopenldap.git

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

46331f0216c4de9fa3aa26273f18b5be2afa6e18