From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Fri, 25 Nov 2016 11:23:26 +0100
Subject: Merge from master into 4.next

Done with git merge --squash -x theirs master
---
 test/rejectlog/0482 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/rejectlog/0482')

diff --git a/test/rejectlog/0482 b/test/rejectlog/0482
index f829fb217..9bbdd8691 100644
--- a/test/rejectlog/0482
+++ b/test/rejectlog/0482
@@ -1,3 +1,5 @@
+
+******** SERVER ********
 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@test.ex> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx
 Envelope-from: <userx@test.ex>
 Envelope-to: <userx@test.ex>
-- 
cgit v1.2.3