Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Wed, 22 Oct 2014 19:40:33 +0000 (12:40 -0700)
committerTodd Lyons <tlyons@exim.org>
Wed, 22 Oct 2014 19:40:33 +0000 (12:40 -0700)

Trivial merge