Fix post-rebase merge issues.
authorJeremy Harris <jgh146exb@wizmail.org>
Mon, 4 Jun 2012 12:36:19 +0000 (13:36 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Mon, 4 Jun 2012 13:57:04 +0000 (14:57 +0100)
commit389ca47a59cc0247fcee8a50da42aa00af5f7a90
tree2584518852c04f168b4d9a284714943b2e8ed4b2
parentb32ddfaa2ca5e305c1edfbbc8facc7b4d4f538b7
Fix post-rebase merge issues.
src/src/functions.h
src/src/globals.h
src/src/tls-gnu.c
src/src/tls-openssl.c
src/src/tls.c
src/src/verify.c
test/log/5420
test/stderr/5420