From 71c26e7455ea1180800dfdaead281fe4d7850abb Mon Sep 17 00:00:00 2001
From: Frank Schmirler <vdr@schmirler.de>
Date: Tue, 2 Sep 2014 08:54:28 +0200
Subject: [PATCH] Merged duplicate

---
 CONTRIBUTORS | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a44768d..0432480 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -119,9 +119,10 @@ Jori Hamalainen
   for extensive testing while making stream compatible to Network Media Tank
   for adding Network Media Tank browser support to HTML pages
 
-owagner
+Oliver Wagner
   for pointing out a problem with the encrypted channel switching fix
   for suggesting use of SO_KEEPALIVE socket option to detect dead sockets
+  for making cStatus::ChannelChange re-tune only if CA IDs changed
 
 Joachim König-Baltes
   for fixing Min/MaxPriority parsing
@@ -225,6 +226,3 @@ hivdr
 hummel99
   for reporting and helping to debug channel switch issues with priority > 0
   for reporting a race condition when switching the server's LiveTV device
-
-Oliver Wagner
-  for making cStatus::ChannelChange re-tune only if CA IDs changed