]> git.sur5r.net Git - openldap/commitdiff
projects / openldap / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97e5f6d 1df85d3)
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Tue, 3 Jan 2017 20:37:14 +0000 (12:37 -0800)
committerQuanah Gibson-Mount <quanah@openldap.org>
Tue, 3 Jan 2017 20:37:14 +0000 (12:37 -0800)
1  2 
build/version.var patch | diff1 | diff2 | blob | history

diff --cc build/version.var
Simple merge
Cloned from git://git.openldap.org/openldap.git