Fix mis-merge
[exim.git] / test / confs / 2151
2016-11-25 Heiko Schlitterman... Merge from master into 4.next
2016-10-08 Jeremy HarrisFix callouts connection fallback from TLS to cleartext...