Merge branch 'master' into dane
authorJeremy Harris <jgh146exb@wizmail.org>
Wed, 20 Aug 2014 19:22:21 +0000 (20:22 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Wed, 20 Aug 2014 19:22:21 +0000 (20:22 +0100)
commita1bccd48f3956b50a13a34f5aed4b72c658c61af
treec2f216cea6f67db514741d89631ef11aa25abc09
parentd8129d876786c938f06dfbe91e51ebe36f09ae43
parenta7538db17824b7fd70c12ef7561a67b85d6f247e
Merge branch 'master' into dane

Conflicts:
doc/doc-txt/ChangeLog
src/src/tls-openssl.c
src/src/transports/smtp.c
src/src/verify.c
12 files changed:
doc/doc-txt/experimental-spec.txt
src/src/deliver.c
src/src/exim.c
src/src/expand.c
src/src/globals.c
src/src/globals.h
src/src/structs.h
src/src/tls-openssl.c
src/src/transports/smtp.c
src/src/transports/smtp.h
src/src/verify.c
test/runtest