Merge branch 'master' of git://git.exim.org/exim
authorTodd Lyons <tlyons@exim.org>
Thu, 14 Aug 2014 19:37:23 +0000 (12:37 -0700)
committerTodd Lyons <tlyons@exim.org>
Thu, 14 Aug 2014 19:37:23 +0000 (12:37 -0700)

Trivial merge