From: Howard Chu <hyc@openldap.org>
Date: Wed, 15 May 2013 00:12:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~662
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81f4d50c77bd3720a0f8f52f586a86561e7667ee;p=thirdparty%2Fopenldap.git

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

81f4d50c77bd3720a0f8f52f586a86561e7667ee