From 53bafb796b654d1f7206196fd97cf8ba0b08ad7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 28 Sep 2015 12:29:58 +0200
Subject: Imported Upstream version 3.0

---
 AUTHORS | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index b25c9ba..d4badfa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,9 @@
 DEVELOPER AND MAINTAINER
-Anton Arapov <anton@redhat.com>
+Jean Delvare <jdelvare@suse.de>
 
 ORIGINAL AUTHORS
 Alan Cox <alan@redhat.com>
-Jean Delvare <khali@linux-fr.org>
+Jean Delvare <jdelvare@suse.de>
 
 CODE CONTRIBUTORS (IN CHRONOLOGICAL ORDER)
 Matt Domsch <Matt_Domsch@dell.com>
@@ -16,6 +16,9 @@ Roberto Nibali <ratz@tac.ch>
 John Cagle <jcagle@kernel.org>
 Jens Elkner <elkner@linofee.org>
 Jarod Wilson <jarod@redhat.com>
+Anton Arapov <anton@redhat.com>
+Roy Franz <roy.franz@linaro.org>
+Tyler Bell <tyler.bell@hp.com>
 
 MANY THANKS TO (IN CHRONOLOGICAL ORDER)
 Werner Heuser
@@ -84,3 +87,4 @@ Thomas Mingarelli
 Andrey Matveyev
 Stefan Tauner
 Naga Chumbalkar
+Jens Rosenboom
-- 
cgit v1.2.3