From: Howard Chu <hyc@openldap.org>
Date: Sat, 23 Mar 2013 21:06:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~688
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc2e2dbaa13f8117e97e626e07c45c792e87ddb2;p=thirdparty%2Fopenldap.git

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

dc2e2dbaa13f8117e97e626e07c45c792e87ddb2