# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1170655554 0
# Node ID c4e19bea83c1f40fc9c36a10d026728a4c2921ae
# Parent  fd5e7ac7f2fae0111f14cdfe3a13d021dc9e20ea# Parent  a6a83c77622976d2c74d959fa22374247bac27bf
merge of '2d32a9c498d38385bb58409a4ba3ac235a915bc5'
     and '827ae06d636c4638d077c76eea03b525dbceb995'

diff -r fd5e7ac7f2fa -r c4e19bea83c1 AUTHORS
--- a/AUTHORS	Mon Feb 05 05:49:03 2007 +0000
+++ b/AUTHORS	Mon Feb 05 06:05:54 2007 +0000
@@ -30,6 +30,7 @@
 Etan 'deryni' Reisner - Developer
 Tim 'marv' Ringenbach - Developer
 Luke 'LSchiere' Schierer - Support
+Megan 'Cae' Schneider (support/QA)
 Evan Schoenberg - Developer
 Stu 'nosnilmot' Tomlinson - Developer
 Nathan 'faceprint' Walp - Developer
diff -r fd5e7ac7f2fa -r c4e19bea83c1 doc/gaim.1.in
--- a/doc/gaim.1.in	Mon Feb 05 05:49:03 2007 +0000
+++ b/doc/gaim.1.in	Mon Feb 05 06:05:54 2007 +0000
@@ -538,27 +538,37 @@
 
  Sean Egan (lead developer) <\fIseanegan@gmail.com\fR>
 .br
- Daniel 'datallah' Atallah
+ Daniel 'datallah' Atallah (developer)
 .br
  Ethan 'Paco-Paco' Blanton (developer)
 .br
+ Thomas Butter (developer)
+.br
+ Sadrul Habib Chowdhury (developer)
+.br
  Mark 'KingAnt' Doliner (developer) <\fIthekingant@users.sourceforge.net\fR>
 .br
  Christian 'ChipX86' Hammond (developer & webmaster) <\fIchipx86@chipx86.com\fR>
 .br
- Gary 'grim' Kramlich
+ Gary 'grim' Kramlich (developer)
 .br
- Richard 'rlaager' Laager <\fIrlaager@users.sf.net\fR>
+ Richard 'rlaager' Laager (developer) <\fIrlaager@pidgin.im\fR>
+.br
+ Christopher 'siege' O'Brien (developer)
 .br
- Christopher 'siege' O'Brien
+ Bartosz Oler (developer)
 .br
- Etan 'deryni' Reisner
+ Etan 'deryni' Reisner (developer)
 .br
- Tim 'marv' Ringenbach <\fImarv_sf@users.sf.net\fR>
+ Tim 'marv' Ringenbach (developer) <\fImarv_sf@users.sf.net\fR>
 .br
  Luke 'LSchiere' Schierer (support)
 .br
- Stu 'nosnilmot' Tomlinson
+ Megan 'Cae' Schneider (support/QA)
+.br
+ Evan Schoenberg (developer)
+.br
+ Stu 'nosnilmot' Tomlinson (developer)
 .br
  Nathan 'faceprint' Walp (developer)
 .br
diff -r fd5e7ac7f2fa -r c4e19bea83c1 libpurple/plugins/log_reader.c
--- a/libpurple/plugins/log_reader.c	Mon Feb 05 05:49:03 2007 +0000
+++ b/libpurple/plugins/log_reader.c	Mon Feb 05 06:05:54 2007 +0000
@@ -2137,7 +2137,7 @@
 	   "WARNING: This plugin is still alpha code and "
 	   "may crash frequently.  Use it at your own risk!"),
 
-	"Richard Laager <rlaager@users.sf.net>",          /**< author         */
+	"Richard Laager <rlaager@pidgin.im>",             /**< author         */
 	GAIM_WEBSITE,                                     /**< homepage       */
 	plugin_load,                                      /**< load           */
 	plugin_unload,                                    /**< unload         */
diff -r fd5e7ac7f2fa -r c4e19bea83c1 pidgin/plugins/timestamp_format.c
--- a/pidgin/plugins/timestamp_format.c	Mon Feb 05 05:49:03 2007 +0000
+++ b/pidgin/plugins/timestamp_format.c	Mon Feb 05 06:05:54 2007 +0000
@@ -146,7 +146,7 @@
 	N_("This plugin allows the user to customize "
 	   "conversation and logging message timestamp "
 	   "formats."),
-	"Richard Laager <rlaager@users.sf.net>",          /**< author         */
+	"Richard Laager <rlaager@pidgin.im>",             /**< author         */
 	GAIM_WEBSITE,                                     /**< homepage       */
 
 	plugin_load,                                      /**< load           */