]> git.sur5r.net Git - openldap/commitdiff
projects / openldap / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4021b88 6c4d6c8)
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Fri, 29 Jan 2016 19:32:44 +0000 (13:32 -0600)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 29 Jan 2016 19:32:44 +0000 (13:32 -0600)
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