Merge branch 'master' of git://git.exim.org/exim
authorTodd Lyons <tlyons@exim.org>
Wed, 23 Apr 2014 12:26:34 +0000 (05:26 -0700)
committerTodd Lyons <tlyons@exim.org>
Wed, 23 Apr 2014 12:26:34 +0000 (05:26 -0700)

Trivial merge