From: Todd Lyons <tlyons@exim.org>
Date: Mon, 20 Oct 2014 14:16:04 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.exim.org/home/git/exim
X-Git-Tag: exim-4_85_RC1~40
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/0160bfb8f6435449f80ccd8a8d20a0d749c0624d

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

0160bfb8f6435449f80ccd8a8d20a0d749c0624d