Merge tag 'exim-4_82_1' exim-4_83_RC1
authorTodd Lyons <tlyons@exim.org>
Wed, 28 May 2014 12:12:00 +0000 (05:12 -0700)
committerTodd Lyons <tlyons@exim.org>
Wed, 28 May 2014 12:12:00 +0000 (05:12 -0700)
commitd502442ac32f8964f6cf86469869cecb035d12c0
tree02c71fa4ec000db2ad83d44306680920ca746cf0
parent27520a688253e1f73c6f59b32312cdf2755aed2c
parent5b7a7c051c9ab9ee7c924a611f90ef2be03e0ad0
Merge tag 'exim-4_82_1'

Fix Conflicts:
src/src/dmarc.c
src/src/dmarc.c