]> git.sur5r.net Git - openldap/commitdiff
projects / openldap / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f53035 cd32051)
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)
Conflicts:
servers/slapd/back-mdb/id2entry.c


Trivial merge
Cloned from git://git.openldap.org/openldap.git