Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Tue, 15 Apr 2014 16:53:43 +0000 (09:53 -0700)
committerTodd Lyons <tlyons@exim.org>
Tue, 15 Apr 2014 16:53:43 +0000 (09:53 -0700)
commit364e49ab87bf81774f12f8b0e21509eb51c88b71
tree86b43906007d8a6cee2f7ad7cea22f2f8aff8a55
parent3695be34bdae5e69ed8188587f03b87b6e929d42
parent10cc8a1e4c3077eefcb37878990753d1d49cf363
Merge branch 'master' of ssh://git.exim.org/home/git/exim

Fixed Conflicts:
doc/doc-txt/ChangeLog
doc/doc-docbook/spec.xfpt
doc/doc-txt/ChangeLog