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/stderr/4509 | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 test/stderr/4509

(limited to 'test/stderr/4509')

diff --git a/test/stderr/4509 b/test/stderr/4509
new file mode 100644
index 000000000..045fadc9b
--- /dev/null
+++ b/test/stderr/4509
@@ -0,0 +1,2 @@
+
+******** SERVER ********
-- 
cgit v1.2.3