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

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

60720f5d9cdc19092d0aad6b0a94e196e5525d1c