Merge branch 'master' into transp_logging_1031
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 21 Jul 2013 16:15:21 +0000 (17:15 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 21 Jul 2013 16:15:21 +0000 (17:15 +0100)
commitb1068abad9c5e5f7046caaf632fd2c71ca702020
treec852ab2a29145c390b0f154ec69c9a2060780cd4
parent71da6ae46ebda11989094def47c4145e6286c67a
parentcb46fd2b91514ce49ad0e13788127d756ed35145
Merge branch 'master' into transp_logging_1031

Conflicts:
src/src/readconf.c
src/src/exim.c