Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Thu, 3 Oct 2013 23:11:04 +0000 (16:11 -0700)
committerTodd Lyons <tlyons@exim.org>
Thu, 3 Oct 2013 23:11:04 +0000 (16:11 -0700)

Trivial merge