diff AUTHORS @ 25717:907ca9a36fe0

explicit merge of '714a7c7f903d11c96ffade34966121da549d998f' and 'd2c40fe4e2181eda5c1c631c7805f17e6b5d22c3' to branch 'org.darkrain42.pidgin.xmpp'
author Paul Aurich <paul@darkrain42.org>
date Thu, 20 Nov 2008 21:13:56 +0000
parents 62a22a224f27
children de712dc6fecd
line wrap: on
line diff
--- a/AUTHORS	Mon Aug 18 17:08:01 2008 +0000
+++ b/AUTHORS	Thu Nov 20 21:13:56 2008 +0000
@@ -24,6 +24,7 @@
 Bartosz Oler - Developer
 Etan 'deryni' Reisner - Developer
 Tim 'marv' Ringenbach - Developer
+Elliott 'QuLogic' Sales de Andrade - Developer
 Luke 'LSchiere' Schierer - Support
 Megan 'Cae' Schneider - support/QA
 Evan Schoenberg - Developer
@@ -37,7 +38,6 @@
 Felipe 'shx' Contreras
 Dennis 'EvilDennisR' Ristuccia
 Peter 'Fmoo' Ruibal
-Elliott 'QuLogic' Sales de Andrade
 Gabriel 'Nix' Schulhof
 Jorge 'Masca' VillaseƱor