From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 20 Aug 2014 19:34:17 +0000 (+0100)
Subject: Merge branch dane-tpda into dane
X-Git-Tag: exim-4_85_RC1~67^2~3
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=83b2729321db62e758a300e372b2dd74e527d004;hp=83b2729321db62e758a300e372b2dd74e527d004;p=exim.git

Merge branch dane-tpda into dane

Conflicts:
	doc/doc-txt/experimental-spec.txt
	src/src/deliver.c
	src/src/functions.h
	src/src/smtp_out.c
	src/src/tls-openssl.c
	src/src/transports/smtp.c
	src/src/verify.c
---