From: Phil Pennock <pdp@exim.org>
Date: Sat, 22 Jan 2011 23:40:43 +0000 (-0500)
Subject: Merge branch 'master' of git://git.exim.org/exim
X-Git-Tag: exim-4_74_RC2^2~4
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fa309239620364ef0f161ba6fa2ed67f372ab510;p=exim.git

Merge branch 'master' of git://git.exim.org/exim
---

fa309239620364ef0f161ba6fa2ed67f372ab510