# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1178234236 0
# Node ID 30ab55257a16d3cd24fab79c24edd73af06cdeae
# Parent  2afea2b41cab98e36eb75aec13653a1b5645e3b1# Parent  25338643b420918d5324d25db8aba66dce1c573d
merge of '8948aba7b9483266336ba61d523cddcda48dbb78'
     and 'f58372d9f7e407c3a201b211b9a742dfd01bdfac'

diff -r 2afea2b41cab -r 30ab55257a16 AUTHORS
--- a/AUTHORS	Thu May 03 23:16:09 2007 +0000
+++ b/AUTHORS	Thu May 03 23:17:16 2007 +0000
@@ -17,14 +17,15 @@
 	Jabber:  seanegn@jabber.org
 	Gadu-Gadu:  1511497
 
-Daniel 'datallah' Atallah
+Daniel 'datallah' Atallah - Developer
 Ethan 'Paco-Paco' Blanton - Developer
 Thomas Butter - Developer
 Sadrul Habib Chowdhury - Developer
 Mark 'KingAnt' Doliner - Developer
 Christian 'ChipX86' Hammond - Developer & Webmaster
 Gary 'grim' Kramlich - Developer
-Richard 'rlaager' Laager
+Richard 'rlaager' Laager - Developer
+Richard 'wabz' Nelson - Developer
 Christopher 'siege' O'Brien - Developer
 Bartosz Oler - Developer
 Etan 'deryni' Reisner - Developer
@@ -37,9 +38,11 @@
 
 Crazy Patch Writers:
 -------------------
+John 'rekkanoryo' Bailey
 Ka-Hing 'javabsp' Cheung
 Felipe 'shx' Contreras
 Decklin Foster
+Casey Harkins
 Peter 'Bleeter' Lawler
 Robert 'Robot101' McQueen
 Benjamin Miller
diff -r 2afea2b41cab -r 30ab55257a16 doc/pidgin.1.in
--- a/doc/pidgin.1.in	Thu May 03 23:16:09 2007 +0000
+++ b/doc/pidgin.1.in	Thu May 03 23:17:16 2007 +0000
@@ -548,6 +548,8 @@
 .br
  Richard 'rlaager' Laager (developer) <\fIrlaager@pidgin.im\fR>
 .br
+ Richard 'wabz' Nelson (developer)
+.br
  Christopher 'siege' O'Brien (developer)
 .br
  Bartosz Oler (developer)
@@ -574,12 +576,12 @@
 .br
 Ka-Hing 'javabsp' Cheung
 .br
-Sadrul Habib Chowdhury
-.br
 Felipe 'shx' Contreras
 .br
 Decklin Foster
 .br
+Casey Harkins
+.br
 Peter 'Bleeter' Lawler
 .br
 Robert 'Robot101' McQueen