Merge the two AUTHORS entries for Motonori Shindo.

Fix a typo in the AUTHORS entry for Pasi Eronen, and add him to the list
of authors in the man page.

svn path=/trunk/; revision=3988

2 files changed, 4 insertions, 6 deletions

diff --git a/AUTHORS b/AUTHORS
index ef87b5c018..81b9580682 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -768,6 +768,8 @@ Motonori Shindo <mshindo[AT]mshindo.net> {
 	    support in PPP dissector
 	Support for decoding additional data, for CHAP, in LCP
 	    Authentication Protocol option
+	Additional vendor (CoSine) for Radius
+	Patches to PPP for CHAP support
 }
 
 Terje Krogdahl <tekr[AT]nextra.com> {
@@ -805,12 +807,7 @@ Graeme Hewson <graeme.hewson[AT]oracle.com> {
 	Additional Ascend codes, and IETF codes, for Radius
 }
 
-Montonori Shindo <mshindo[at]mshindo.net> {
-	Additional vendor for Radius
-	Patches to ppp for chap support
-}
-
-Pasi Eronen <pasi.eronen[at]nixu.com {
+Pasi Eronen <pasi.eronen[at]nixu.com> {
 	Patches to the dcerpc dissector for data representation decoding
 }
 
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 9b16d6d1f7..8b28c4f5f1 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1159,6 +1159,7 @@ B<http://www.ethereal.com>.
   Tom Uijldert             <Tom.Uijldert[AT]cmg.nl>
   Endoh Akira              <endoh[AT]netmarks.co.jp>
   Graeme Hewson            <graeme.hewson[AT]oracle.com>
+  Pasi Eronen              <pasi.eronen[at]nixu.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.