Merge branch 'master' of git://git.exim.org/exim exim-4_82_RC5
authorTodd Lyons <tlyons@exim.org>
Tue, 22 Oct 2013 12:11:33 +0000 (05:11 -0700)
committerTodd Lyons <tlyons@exim.org>
Tue, 22 Oct 2013 12:11:33 +0000 (05:11 -0700)

Trivial merge