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

Browse Source

Conflicts:
	servers/slapd/back-mdb/id2entry.c

...

This commit is contained in:

Howard Chu 2013-01-22 12:35:36 +00:00

parent 2f53035a51 cd32051ff4

commit 8325ad2af2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available