Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Mon, 20 Oct 2014 14:16:04 +0000 (07:16 -0700)
committerTodd Lyons <tlyons@exim.org>
Mon, 20 Oct 2014 14:16:04 +0000 (07:16 -0700)

Trivial merge