]> git.sur5r.net Git - openldap/commit
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorHoward Chu <hyc@openldap.org>
Tue, 22 Jan 2013 12:35:36 +0000 (12:35 +0000)
committerHoward Chu <hyc@openldap.org>
Tue, 22 Jan 2013 12:35:36 +0000 (12:35 +0000)
commit8325ad2af2e0cf2a906208d88884b2a90d2915d8
tree9094882fac6e75bdc4681ce0dc86be06467fb40d
parent2f53035a511f8f158ab0f40e18cd96b1a2157145
parentcd32051ff4b79dc26438e652ccb432f34ba2db82
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap

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