diff AUTHORS @ 17262:8a7238fb7905

explicit merge of 'dc4f2ee34039521ae6a198fe7d62f4dca8a84589' and '9d8bc74c7c13474edcefafedd0af9020b27c9a2f'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Wed, 30 May 2007 02:56:25 +0000
parents 2b82b01e016a
children 1e2e5beb4692
line wrap: on
line diff
--- a/AUTHORS	Wed May 23 04:18:05 2007 +0000
+++ b/AUTHORS	Wed May 30 02:56:25 2007 +0000
@@ -3,8 +3,7 @@
 
 For a complete list of all contributors, see the COPYRIGHT file.
 
-We've got an IRC room now too, #pidgin on irc.freenode.net
-(#pidgin-win32 for Windows users). Come check us out.
+We've got an IRC room now too, #pidgin on irc.freenode.net. Come check us out.
 
 Current Developers:
 ------------------
@@ -14,17 +13,18 @@
 	ICQ: 96642211
 	Yahoo:	SeanEgn
 	MSN:  seanegn@hotmail.com
-	Jabber:  seanegn@jabber.org
+	XMPP:  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 +37,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
@@ -52,7 +54,7 @@
 Rob Flynn <gaim@robflynn.com> - maintainer
 Adam Fritzler - libfaim maintainer
 Syd Logan - hacker and designated driver [lazy bum]
-Jim Seymour - Jabber developer
+Jim Seymour - XMPP developer
 Mark Spencer <markster@marko.net> - original author
 Eric Warmenhoven <eric@warmenhoven.org> - lead developer