Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Tue, 13 May 2014 15:36:22 +0000 (08:36 -0700)
committerTodd Lyons <tlyons@exim.org>
Tue, 13 May 2014 15:36:22 +0000 (08:36 -0700)

Trivial merge