From: Todd Lyons <tlyons@exim.org>
Date: Thu, 14 Aug 2014 19:37:23 +0000 (-0700)
Subject: Merge branch 'master' of git://git.exim.org/exim
X-Git-Tag: exim-4_85_RC1~83
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8961fcec0ad3fab6984a7c2ff85d2ec2a5060157;p=exim.git

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

8961fcec0ad3fab6984a7c2ff85d2ec2a5060157