From: Howard Chu Date: Tue, 22 Jan 2013 12:35:36 +0000 (+0000) Subject: Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8325ad2af2e0cf2a906208d88884b2a90d2915d8;p=openldap Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap Conflicts: servers/slapd/back-mdb/id2entry.c --- 8325ad2af2e0cf2a906208d88884b2a90d2915d8