Merge branch 'master' of git://git.exim.org/exim
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 22 Apr 2012 21:28:57 +0000 (22:28 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 22 Apr 2012 21:28:57 +0000 (22:28 +0100)

Trivial merge