Merge branch 'master' into transp_logging_1031
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 30 Jun 2013 16:02:05 +0000 (17:02 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 30 Jun 2013 16:04:35 +0000 (17:04 +0100)
commit35e4802b4bdf92823c4813e61d9e6ddf5162f8ca
tree399e39b934fe02309c0cdd9281175d99afac18da
parentf9850c6c4851862a66f6ce58bb9ac19ddac7895c
parent880496ef634b16eeef91cafde8f04e9833275334
Merge branch 'master' into transp_logging_1031

Conflicts:
doc/doc-txt/experimental-spec.txt
src/src/EDITME
src/src/deliver.c
src/src/exim.c
doc/doc-txt/experimental-spec.txt
src/src/EDITME
src/src/config.h.defaults
src/src/deliver.c
src/src/exim.c
src/src/expand.c
src/src/globals.c
src/src/globals.h
src/src/readconf.c
src/src/transports/smtp.c
src/src/transports/smtp.h