Merge branch 'master' of git://git.exim.org/exim
authorJeremy Harris <jgh146exb@wizmail.org>
Wed, 9 May 2012 17:51:31 +0000 (18:51 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Wed, 9 May 2012 17:51:31 +0000 (18:51 +0100)

Trivial merge