update CREDITS

Move 3 past maintainers to the respective section, fixup formatting for
consistency and specify ordering within sections. Copy e-mail address
updates for Hannes and Francois-Xavier from tcpdump.

diff --git a/CREDITS b/CREDITS
index b959c77c07e81f9cf549b29148cf8c8bac5e5bc4..712c78737ce8f0743850e265b99b9733aac532be 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1,16 +1,12 @@
-This file lists people who have contributed to libpcap:
+This file lists people who have contributed to libpcap.
 
-The current maintainers:
-    Bill Fenner                   <fenner at research dot att dot com>
+The current maintainers (in alphabetical order):
     Denis Ovsienko                <denis at ovsienko dot info>
-    Fulvio Risso                  <risso at polito dot it>
+    Francois-Xavier Le Bail       <devel dot fx dot lebail at orange dot fr>
     Guy Harris                    <guy at alum dot mit dot edu>
-    Hannes Gredler                <hannes at juniper dot net>
     Michael Richardson            <mcr at sandelman dot ottawa dot on dot ca>
-    Francois-Xavier Le Bail       <fx dot lebail at yahoo dot com>
-
-Additional people who have contributed patches:
 
+Additional people who have contributed patches (in alphabetical order):
     Akos Vandra                   <axos88 at gmail dot com>
     Alan Bawden                   <Alan at LCS dot MIT dot EDU>
     Albert Chin                   <china at thewrittenword dot com>
@@ -176,5 +172,8 @@ The original LBL crew:
     Craig Leres
     Van Jacobson
 
-Past maintainers:
-    Jun-ichiro itojun Hagino         <itojun at iijlab dot net>                Also see: http://www.wide.ad.jp/itojun-award/
+Past maintainers (in alphabetical order):
+    Bill Fenner                   <fenner at research dot att dot com>
+    Fulvio Risso                  <risso at polito dot it>
+    Hannes Gredler                <hannes at gredler dot at>
+    Jun-ichiro itojun Hagino      <itojun at iijlab dot net>           Also see: http://www.wide.ad.jp/itojun-award/