To quote the Wikipedia entry for the University of Duisburg-Essen, "In

2003 the Gerhard-Mercator-University and the University of Essen merged
to the University of Duisburg-Essen.", so the two entries for Thomas
Dreibholz are probably for the same person; merge them.

teluna.org is the site for a Joost Damad and an Isabelle Marien, and
following the links to his blog indicates that he's a Debian user and at
least uses openMSX.  A search for Joost Yervante Damad also finds a
recommendation to accept a Joost Yervante Damad as a Debian developer;
he says he maintains openMSX and is "a software developer and integrator
for a large multinational".  My guess is that said large multinational
is Siemens, so I'm assuming the two Joost Yervante Damad entries are for
the same person.

That leaves the two Thomas Palmers; they might be the same person, but
it's conceivable that they're not, so I'll do a bit more digging before
combining those entries.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28632 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index 3c017b5683d961535c5d08a8c834e0f5d63aae43..5cf092c907bc6e7fc5a59e5c831d45f47b0e607e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -2524,8 +2524,9 @@ Kees Cook         <kees [AT] outflux.net> {
        TiVoConnect Discovery Protocol
 }
 
-Thomas Dreibholz       <dreibh [AT] exp-math.uni-essen.de> {
+Thomas Dreibholz       <dreibh [AT] iem.uni-due.de> {
        RSerPol protocol stack
+       Scripting Service Protocol support
 }
 
 Authesserre Samuel     <sauthess [AT] gmail.com> {
@@ -2736,10 +2737,6 @@ Shane Kearns             <shane.kearns [AT] symbian.com> {
        Support Symbian OS btsnoop
 }
 
-Thomas Dreibholz       <dreibh [AT] iem.uni-due.de> {
-       Scripting Service Protocol support
-}
-
 Loris Degioanni                <loris.degioanni [AT] cacetech.com> {
        Rawshark
 }
@@ -2903,7 +2900,6 @@ Arsen Chaloyan          <achaloyan [AT] yahoo.com>
 Arnaud Jacques          <webmaster [AT] securiteinfo.com>
 D. Manzella             <manzella [AT] lucent.com>
 Jari Mustajarvi         <jari.mustajarvi [AT] nokia.com>
-Joost Yervante Damad    <Joost.Damad [AT] siemens.com>
 Pierre Juhen            <pierre.juhen [AT] wanadoo.fr>
 David Richards          <drichards [AT] alum.mit.edu>
 Shusaku Ueda            <ueda [AT] sra.co.jp>