From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Wed, 2 Mar 2016 18:53:07 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Tag: exim-4_87_RC6~16
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/d1af83598f7d6b32516a11bb28e569d592a05c48

Merge branch 'master'
---

d1af83598f7d6b32516a11bb28e569d592a05c48