fixup credits

A recent commit replaced tcpdump contributors list  with libpcap
contributors list and added to the replaced list new libpcap
contributors. Restore the original list and add new tcpdump
contributors:

* Bram
* Dmitrij Tejblum
* fra
* Gregory Detal
* Jorge Boncompte [DTI2]
* Longinus00
* Marc Abramowitz
* Ola Martin Lykkja
* Oleksij Rempel
* Petar Alilovic
* Stephane Bortzmeyer
* Thomas Jacob
* Udayakumar
* Wim Torfs

Fix some sorting and formatting while at it.

1 files changed, 155 insertions, 111 deletions

diff --git a/CREDITS b/CREDITS
index 71c96002..2abe0faf 100644
--- a/CREDITS
+++ b/CREDITS
@@ -10,165 +10,209 @@ The current maintainers:
 
 Additional people who have contributed patches:
 
-    Akos Vandra                   <axos88 at gmail dot com>
-    Alan Bawden                   <Alan at LCS dot MIT dot EDU>
+    Aaron Campbell                <aaron at arbor dot net>
+    A Costa                       <agcosta at gis dot net>
     Albert Chin                   <china at thewrittenword dot com>
-    Alexander 'Leo' Bergolth      <Leo dot Bergolth at wu-wien dot ac dot at>
-    Alexey Kuznetsov              <kuznet at ms2 dot inr dot ac dot ru>
-    Alon Bar-Lev                  <alonbl at sourceforge dot net>
-    Andres Perera                 <andres dot p at zoho dot com>
+    Alexandra Kossovsky           <alexandra1975 at sourceforge dot net>
+    Alfredo Andres                <aandres at s21sec dot com>
+    Ananth Suryanarayana          <anantha at juniper dot net>
+    Andrea Bittau                 <a dot bittau at cs dot ucl dot ac dot uk>
     Andrew Brown                  <atatat at atatdot dot net>
-                                  <andy-1 at sourceforge dot net>
-    Ani Sinha                     <ani at aristanetworks dot com>
-    Antti Kantee                  <pooka at netbsd dot org>
-    Arien Vijn                    <arienvijn at sourceforge dot net>
+    Andrew Church                 <andrew at users dot sourceforge dot net>
+    Andrew Hintz                  <adhintz at users dot sourceforge dot net>
+    Andrew Nording                <andrew at nording dot ru>
+    Andrew Tridgell               <tridge at linuxcare dot com>
+    Andy Heffernan                <ahh at juniper dot net>
+    Anton Bernal                  <anton at juniper dot net>
     Arkadiusz Miskiewicz          <misiek at pld dot org dot pl>
     Armando L. Caro Jr.           <acaro at mail dot eecis dot udel dot edu>
-    Assar Westerlund              <assar at sics dot se>
+    Arnaldo Carvalho de Melo      <acme at ghostprotocols dot net>
+    Atsushi Onoe                  <onoe at netbsd dot org>
+    Ben Byer                      <bushing at sourceforge dot net>
+    Ben Smithurst                 <ben at scientia dot demon dot co dot uk>
+    Bert Vermeulen                <bert at biot dot com>
+    Bjoern A. Zeeb                <bzeeb at Zabbadoz dot NeT>
+    Bram                          <tcpdump at mail dot wizbit dot be>
+    Brent L. Bates                <blbates at vigyan dot com>
     Brian Ginsbach                <ginsbach at cray dot com>
-    Bill Parker			  <wp02855 at gmail dot com>
-    Brent Cook                    <brent at boundary dot com>
+    Bruce M. Simpson              <bms at spc dot org>
+    Carles Kishimoto Bisbe        <ckishimo at ac dot upc dot es>
     Charles M. Hannum             <mycroft at netbsd dot org>
+    Charlie Lenahan               <clenahan at fortresstech dot com>
+    Chris Cogdon                  <chris at cogdon dot org>
     Chris G. Demetriou            <cgd at netbsd dot org>
-    Chris Lightfoot               <cwrl at users dot sourceforge dot net>
-    Chris Maynard                 <Chris dot Maynard at gtech dot com>
-    Chris Pepper                  <pepper at mail dot reppep dot com>
-    Christian Bell                <csbell at myri dot com>
-    Christian Peron               <csjp at freebsd dot org>
-    Christian Svensson            <blue at cmd dot nu>
-    Daniele Orlandi               <daniele at orlandi dot com>
-    Darren Lim                    <darren dot lim at endace dot com>
-    Darren Reed                   <darrenr at sun dot com>
-    David Clark                   <david dot clark at datasoft dot com>
-    David Kaelbling               <drk at sgi dot com>
+    Chris Jepeway                 <jepeway at blasted-heath dot com>
+    Chris Larson                  <clarson at kergoth dot com>
+    Christian Sievers             <c_s at users dot sourceforge dot net>
+    Christophe Rhodes             <csr21 at cantab dot net>
+    Cliff Frey                    <cliff at meraki dot com>
+    Craig Rodrigues               <rodrigc at mediaone dot net>
+    Crist J. Clark                <cjclark at alum dot mit dot edu>
+    Daniel Hagerty                <hag at ai dot mit dot edu>
+    Darren Reed                   <darrenr at reed dot wattle dot id dot au>
+    David Binderman               <d dot binderman at virgin dot net>
+    David Horn                    <dhorn2000 at gmail dot com>
+    David Smith                   <dsmith at redhat dot com>
     David Young                   <dyoung at ojctech dot com>
-    David Ward                    <david dot ward at ll dot mit dot edu>
-    Dean Gaudet                   <dean at arctic dot org>
-    dhruv                         <rsrivat at sourceforge dot net>
-    Don Ebright                   <Don dot Ebright at compuware dot com> 
-    Dug Song                      <dugsong at monkey dot org>
-    Dustin Spicuzza               <dustin at virtualroadside dot com>
-    dzejarczech                   <dzejarczech at sourceforge dot net>
-    Edward Sheldrake              <ejs1920 at sourceforge dot net>
-    Eric Anderson                 <anderse at hpl dot hp dot com>
-    Erik de Castro Lopo           <erik dot de dot castro dot lopo at sensorynetworks dot com>
-    Felix Obenhuber               <felix at obenhuber dot de>
+    Dmitrij Tejblum               <tejblum at yandex-team dot ru>
+    Dmitry Eremin-Solenikov       <dbaryshkov at gmail dot com>
+    Don Ebright                   <Don dot Ebright at compuware dot com>
+    Eddie Kohler                  <xexd at sourceforge dot net>
+    Elmar Kirchner                <elmar at juniper dot net>
+    Fang Wang                     <fangwang at sourceforge dot net>
     Florent Drouin                <Florent dot Drouin at alcatel-lucent dot fr>
-    Franz Schaefer                <schaefer at mond dot at>
-    frederich                     <frederich at sourceforge dot net>
-    Fulko Hew                     <fulko dot hew at gmail dot com>
-    Fumiyuki Shimizu              <fumifumi at abacustech dot jp>
-    Gabor Tatarka                 <gabor dot tatarka at ericsson dot com>
-    Garrett Cooper                <yaberauneya at sourceforge dot net>
-    George Neville-Neil           <gnn at freebsd dot org>
-    Gianluca Varenni              <gianluca dot varenni at gmail dot com>
-    Gilbert Hoyek                 <gil_hoyek at hotmail dot com>
+    Florian Forster               <octo at verplant dot org>
+    fra                           <foo at bar dot baz>
+    Francesco Fondelli            <francesco dot fondelli at gmail dot com>
+    Francisco Matias Cuenca-Acuna <mcuenca at george dot rutgers dot edu>
+    Francis Dupont                <Francis dot Dupont at enst-bretagne dot fr>
+    Francois-Xavier Le Bail       <fx dot lebail at yahoo dot com>
+    Frank Volf                    <volf at oasis dot IAEhv dot nl>
+    Fulvio Risso                  <risso at polito dot it>
+    George Bakos                  <gbakos at ists dot dartmouth dot edu>
+    Gerald Combs                  <gerald at ethereal dot com>
+    Gerrit Renker                 <gerrit at erg dot abdn dot ac dot uk>
+    Gert Doering                  <gert at greenie dot muc dot de>
+    Gilbert Ramirez Jr.           <gram at xiexie dot org>
     Gisle Vanem                   <gvanem at broadpark dot no>
-    Graeme Hewson                 <ghewson at cix dot compulink dot co dot uk>
+    Greg Minshall                 <minshall at acm dot org>
+    Grégoire Henry                <henry at pps dot jussieu dot fr>
+    Gregory Detal                 <gregory dot detal at uclouvain dot be>
     Greg Stark                    <gsstark at mit dot edu>
-    Greg Troxel                   <gdt at ir dot bbn dot com>
-    Gregor Maier                  <gregor at net dot in dot tum dot de>
-    Guillaume Pelat               <endymion_ at users dot sourceforge dot net>
-    Gustavo Zacarias              <gustavo at zacarias dot com dot ar>
-    Hagen Paul Pfeifer            <hagen at jauu dot net>
-    Henri Doreau                  <hdoreau at sourceforge dot net>
-    Hyung Sik Yoon                <hsyn at kr dot ibm dot com>
-    Igor Khristophorov            <igor at atdot dot org>
-    Jakub Zawadzki                <darkjames at darkjames dot pl>
-    Jan-Philip Velders            <jpv at veldersjes dot net>
+    Hank Leininger                <tcpdump-workers at progressive-comp dot com>
+    Hannes Viertel                <hviertel at juniper dot net>
+    Harry Raaymakers              <harryr at connect dot com dot au>
+    Heinz-Ado Arnolds             <Ado dot Arnolds at dhm-systems dot de>
+    Hendrik Scholz                <hendrik at scholz dot net>
+    Ian McDonald                  <imcdnzl at gmail dot com>
+    Ilpo Järvinen                 <ilpo dot jarvinen at helsinki dot fi>
+    Jacek Tobiasz                 <Jacek dot Tobiasz at atm dot com dot pl>
+    Jakob Schlyter                <jakob at openbsd dot org>
+    Jamal Hadi Salim              <hadi at cyberus dot ca>
+    Jan Oravec                    <wsx at wsx6 dot net>
     Jason R. Thorpe               <thorpej at netbsd dot org>
-    Javier Achirica               <achirica at ttd dot net>
-    Jean Tourrilhes               <jt at hpl dot hp dot com>
-    Jean-Louis Charton            <Jean-Louis.CHARTON at oikialog dot com>
     Jefferson Ogata               <jogata at nodc dot noaa dot gov>
-    Jesper Dangaard Brouer        <hawk at comx dot dk>
+    Jeffrey Hutzelman             <jhutz at cmu dot edu>
     Jesper Peterson               <jesper at endace dot com>
-    Jiri Slaby                    <jirislaby at gmail dot com>
+    Jim Hutchins                  <jim at ca dot sandia dot gov>
+    João Medeiros                 <ignotus21 at sourceforge dot net>
     Joerg Mayer                   <jmayer at loplof dot de>
-    John Bankier                  <jbankier at rainfinity dot com>
-    Jon Lindgren                  <jonl at yubyub dot net>
-    Jon Smirl                     <jonsmirl at gmail dot com>
+    Jonathan Heusser              <jonny at drugphish dot ch>
     Jorge Boncompte [DTI2]        <jorge at dti2 dot net>
-    Juergen Schoenwaelder         <schoenw at ibr dot cs dot tu-bs dot de>
-    Julien Moutinho               <julm at savines dot alpes dot fr dot eu dot org>
-    Jung-uk Kim                   <jkim at FreeBSD dot org>
+    Jørgen Thomsen                <jth at jth dot net>
+    Julian Cowley                 <julian at lava dot net>
+    Juliusz Chroboczek            <jch at pps dot jussieu dot fr>
+    Kaarthik Sivakumar            <kaarthik at torrentnet dot com>
+    Kaladhar Musunuru             <kaladharm at sourceforge dot net>
+    Karl Norby                    <karl-norby at sourceforge dot net>
     Kazushi Sugyo                 <sugyo at pb dot jp dot nec dot com>
-    Klaus Klein                   <kleink at netbsd dot org>
-    Koryn Grant                   <koryn at endace dot com>
-    Kris Katterjohn               <katterjohn at gmail dot com>
+    Kelly Carmichael              <kcarmich at ipapp dot com>
+    Ken Hornstein                 <kenh at cmf dot nrl dot navy dot mil>
+    Kenichi Maehashi              <webmaster at kenichimaehashi dot com>
+    Kevin Steves                  <stevesk at pobox dot com>
+    Klaus Klein                   <kleink at reziprozitaet dot de>
+    Kris Kennaway                 <kris at freebsd dot org>
     Krzysztof Halasa              <khc at pm dot waw dot pl>
-    Lorenzo Cavallaro             <sullivan at sikurezza dot org>
+    Larry Lile                    <lile at stdio dot com>
+    Lennert Buytenhek             <buytenh at gnu dot org>
+    Longinus00                    <Longinus00 at gmail dot com>
     Loris Degioanni               <loris at netgroup-serv dot polito dot it>
     Love Hörnquist-Åstrand        <lha at stacken dot kth dot se>
+    Lucas C. Villa Real           <lucasvr at us dot ibm dot com>
     Luis MartinGarcia             <luis dot mgarc at gmail dot com>
     Maciej W. Rozycki             <macro at ds2 dot pg dot gda dot pl>
-    Mansour Behabadi              <mansour at oxplot dot com>
+    Manu Pathak                   <mapathak at cisco dot com>
     Marc Abramowitz               <marc at marc-abramowitz dot com>
-    Marcus Felipe Pereira         <marcus at task dot com dot br>
-    Mark C. Brown                 <mbrown at hp dot com>
-    Mark Pizzolato                <List-tcpdump-workers at subscriptions dot pizzolato dot net>
-    Markus Mayer                  <markus_mayer at sourceforge dot net>
-    Mansour Behabadi              <mansour at oxplot dot com>
+    Marc A. Lehmann               <pcg at goof dot com>
+    Marc Binderberger             <mbind at sourceforge dot net>
+    Mark Ellzey Thomas            <mark at ackers dot net>
+    Marko Kiiskila                <carnil at cs dot tut dot fi>
+    Markus Schöpflin              <schoepflin at sourceforge dot net>
+    Marshall Rose                 <mrose at dbc dot mtview dot ca dot us>
     Martin Husemann               <martin at netbsd dot org>
-    Márton Németh                 <nm127 at freemail dot hu>
-    Matthew Luckie                <mjl at luckie dot org dot nz>
     Max Laier                     <max at love2party dot net>
-    Michal Labedzki               
+    Michael A. Meffie III         <meffie at sourceforge dot net>
+    Michael Madore                <mmadore at turbolinux dot com>
+    Michael Riepe                 <too-tired at sourceforge dot net>
+    Michael Shalayeff             <mickey at openbsd dot org>
+    Michael Shields               <shields at msrl dot com>
+    Michael T. Stolarchuk         <mts at off dot to>
     Michal Sekletar               <msekleta at redhat dot com>
+    Michele "mydecay" Marchetto   <smarchetto1 at tin dot it>
     Mike Frysinger                <vapier at gmail dot com>
-    Mike Kershaw                  <dragorn at kismetwireless dot net>
-    Mike Wiacek                   <mike at iroot dot net>
-    Miroslav Lichvar              <mlichvar at redhat dot com>
+    Minto Jeyananth               <minto at juniper dot net>
     Monroe Williams               <monroe at pobox dot com>
-                                  <nvercamm at sourceforge dot net>
-    N. Leiten                     <nleiten at sourceforge dot net>
-    Nicolas Dade                  <ndade at nsd dot dyndns dot org>
-    Niko Delarich                 <niko dot delarich at gmail dot com>
-    Octavian Cerna                <tavy at ylabs dot com>
+    Motonori Shindo               <mshindo at mshindo dot net>
+    Nathaniel Couper-Noles        <Nathaniel at isi1 dot tccisi dot com>
+    Nathan J. Williams            <nathanw at MIT dot EDU>
+    Neil T. Spring                <bluehal at users dot sourceforge dot net>
+    Nickolai Zeldovich            <kolya at MIT dot EDU>
+    Nicolas Ferrero               <toorop at babylo dot net>
+    Niels Provos                  <provos at openbsd dot org>
+    Noritoshi Demizu              <demizu at users dot sourceforge dot net>
     Olaf Kirch                    <okir at caldera dot de>
-    Ollie Wild                    <aaw at users dot sourceforge dot net>
+    Ola Martin Lykkja             <ola dot lykkja at q-free dot com>
+    Oleksij Rempel                <linux at rempel-privat dot de>
     Onno van der Linden           <onno at simplex dot nl>
     Paolo Abeni                   <paolo dot abeni at email dot it>
-    Patrick Marie                 <mycroft at virgaria dot org>
-    Patrick McHardy               <kaber at trash not net>
+    Pascal Hennequin              <pascal dot hennequin at int-evry dot fr>
+    Pasvorn Boonmark              <boonmark at juniper dot net>
+    Paul Ferrell                  <pflarr at sourceforge dot net>
     Paul Mundt                    <lethal at linux-sh dot org>
-    Pavel Kankovsky               <kan at dcit dot cz>
-    Pawel Pokrywka                <publicpp at gmail dot com>
+    Paul S. Traina                <pst at freebsd dot org>
+    Pavlin Radoslavov             <pavlin at icir dot org>
+    Pawel Worach                  <pawel dot worach at gmail dot com>
+    Pekka Savola                  <pekkas at netcore dot fi>
+    Petar Alilovic                <petar dot alilovic at gmail dot com>
     Peter Fales                   <peter at fales-lorenz dot net>
     Peter Jeremy                  <peter dot jeremy at alcatel dot com dot au>
     Peter Volkov                  <pva at gentoo dot org>
+                                  <pfhunt at users dot sourceforge dot net>
     Phil Wood                     <cpw at lanl dot gov>
     Rafal Maszkowski              <rzm at icm dot edu dot pl>
-                                  <rcb-isis at users dot sourceforge dot net>
-    Richard Stearn                <richard at rns-stearn dot demon dot co dot uk>
-    Rick Jones                    <raj at cup dot hp dot com>
+    Randy Sofia                   <rsofia at users dot sourceforge dot net>
+    Raphael Raimbault             <raphael dot raimbault at netasq dot com>
+    Rick Cheng                    <rcheng at juniper dot net>
+    Rick Jones                    <rick dot jones2 at hp dot com>
+    Rick Watson                   <watsonrick at users dot sourceforge dot net>
+    Rob Braun                     <bbraun at synack dot net>
     Robert Edmonds                <stu-42 at sourceforge dot net>
-    Roberto Mariani               <jelot-tcpdump at jelot dot it>
+    Roderick Schertler            <roderick at argon dot org>
     Romain Francoise              <rfrancoise at debian dot org>
+    Ruben Kerkhof                 <ruben at rubenkerkhof dot com>
     Sagun Shakya                  <sagun dot shakya at sun dot com>
-    Scott Barron                  <sb125499 at ohiou dot edu>
-    Scott Gifford                 <sgifford at tir dot com>
+    Sami Farin                    <safari at iki dot fi>
     Scott Mcmillan                <scott dot a dot mcmillan at intel dot com>
+    Scott Rose                    <syberpunk at users dot sourceforge dot net>
     Sebastian Krahmer             <krahmer at cs dot uni-potsdam dot de>
-    Sebastien Roy                 <Sebastien dot Roy at Sun dot COM>
+    Sebastien Raveau              <sebastien dot raveau at epita dot fr>
+    Sebastien Vincent             <svincent at idems dot fr>
     Sepherosa Ziehau              <sepherosa at gmail dot com>
-    Shaun Clowes                  <delius at progsoc dot uts dot edu dot au>
-    Solomon Peachy                <pizza at shaftnet dot org>
-    Stefan Hudson                 <hudson at mbay dot net>
-    Stephen Donnelly              <stephen at endace dot com>
+    Seth Webster                  <swebster at sst dot ll dot mit dot edu>
+    Shinsuke Suzuki               <suz at kame dot net>
+    Simon Ruderich                <simon at ruderich dot org>
+    Steinar Haug                  <sthaug at nethelp dot no>
+    Stephane Bortzmeyer           <stephane+github at bortzmeyer dot org>
+    Swaminathan Chandrasekaran    <chander at juniper dot net>
     Takashi Yamamoto              <yamt at mwd dot biglobe dot ne dot jp>
-    Tanaka Shin-ya                <zstanaka at archer dot livedoor dot com>
-    Tobias Poschwatta             <posch at sourceforge dot net>
+    Tatuya Jinmei                 <jinmei at kame dot net>
+    Terry Kennedy                 <terry at tmk dot com>
+    Thomas Jacob                  <jacob at internet24 dot de>
+    Timo Koskiahde
     Tony Li                       <tli at procket dot com>
-    Torsten Landschoff            <torsten at debian dot org>
+    Toshihiro Kanda               <candy at fct dot kgc dot co dot jp>
+    Udayakumar                    <udaya011 at gmail dot com>
     Uns Lider                     <unslider at miranda dot org>
-    Uwe Girlich                   <Uwe dot Girlich at philosys dot de>
+    Victor Oppleman               <oppleman at users dot sourceforge dot net>
+    Weesan Lee                    <weesan at juniper dot net>
+    Wesley Griffin                <wgriffin at users dot sourceforge dot net>
     Wesley Shields                <wxs at FreeBSD dot org>
-    Xianjie Zhang                 <xzhang at cup dot hp dot com>
-    Xin Li                        <delphij at FreeBSD dot org>
+    Wilbert de Graaf              <wilbertdg at hetnet dot nl>
+    Will Drewry                   <will at alum dot bu dot edu>
+    William J. Hulley             <bill dot hulley at gmail dot com>
+    Wim Torfs                     <wtorfs at gmail dot com>
     Yen Yen Lim
-    Yvan Vanhullebus              <vanhu at sourceforge dot net>
-    Yoann Vandoorselaere          <yoann at prelude-ids dot org>
+    Yoshifumi Nishida
 
 The original LBL crew:
     Steve McCanne