Commit 8325ad2a authored by Howard Chu's avatar Howard Chu
Browse files

Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap

Conflicts:
	servers/slapd/back-mdb/id2entry.c
parents 2f53035a cd32051f
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment