Merge branch 'master' of git://git.exim.org/exim
authorJeremy Harris <jgh146exb@wizmail.org>
Sat, 5 May 2012 20:10:19 +0000 (21:10 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Sat, 5 May 2012 20:10:19 +0000 (21:10 +0100)

Trivial merge