merged differences between this file and doc/ethereal.pod

svn path=/trunk/; revision=10962

1 files changed, 7 insertions, 1 deletions

diff --git a/AUTHORS b/AUTHORS
index c5673083e6..a9a87ec7e6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,5 @@
+
+
 Original Author
 -------- ------
 Gerald Combs            <gerald[AT]ethereal.com>
@@ -1557,7 +1559,7 @@ Renzo Tomas             <renzo.toma [AT] xs4all.nl> {
 	Skinny bugfix for configStat and serverRes
 }
 
-Clive A Stubbings       <eth [AT] vjet.demon.co.uk> {
+Clive A. Stubbings      <eth [AT] vjet.demon.co.uk> {
 	802.1s Multiple Spanning Tree Protocol
 }
 
@@ -2138,6 +2140,7 @@ Thomas Anders           <thomas.anders [AT] blue-cable.de> {
 
 And assorted fixes and enhancements by the people listed above and by:
 
+
 Pavel Roskin            <proski [AT] gnu.org>
 Georgi Guninski         <guninski [AT] guninski.com>
 Jason Copenhaver        <jcopenha [AT] typedef.org>
@@ -2185,6 +2188,9 @@ Clinton Work            <clinton [AT] scripty.com>
 Joe Marcus Clarke       <marcus [AT] marcuscom.com>
 Kendy Kutzner           <kutzner[AT]tm.uka.de>
 James H. Cloos Jr.      <cloos [AT] jhcloos.com>
+Tim Farley              <tfarley[AT]iss.net>
+Daniel Thompson         <daniel.thompson[AT]st.com>
+Chris Jepeway           <thai-dragon[AT]eleven29.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.