From: Todd Lyons <tlyons@exim.org>
Date: Sat, 6 Sep 2014 05:17:37 +0000 (-0700)
Subject: Merge branch 'master_condition_description'
X-Git-Tag: exim-4_85_RC1~64
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=f4952db2835a261d478321c930db5af27496e598

Merge branch 'master_condition_description'
---

f4952db2835a261d478321c930db5af27496e598