Mercurial > pidgin
diff AUTHORS @ 26769:6bc0e4e76207
merge of '9df36977fc8f70d1b3124d32a54eb123df50aa0f'
and 'f92d95c83baba97463f923077688ba2eb144763b'
author | Peter Hjalmarsson <xake@rymdraket.net> |
---|---|
date | Fri, 01 May 2009 21:36:29 +0000 |
parents | 89f7e9924204 |
children | 542b75da206e |
line wrap: on
line diff
--- a/AUTHORS Mon Mar 16 21:44:22 2009 +0000 +++ b/AUTHORS Fri May 01 21:36:29 2009 +0000 @@ -9,6 +9,7 @@ ------------------ Daniel 'datallah' Atallah - Developer +Paul 'darkrain42' Aurich - Developer John 'rekkanoryo' Bailey - Developer Ethan 'Paco-Paco' Blanton - Developer Thomas Butter - Developer @@ -24,6 +25,7 @@ Bartosz Oler - Developer Etan 'deryni' Reisner - Developer Tim 'marv' Ringenbach - Developer +Michael 'Maiku' Ruprecht - Developer, voice and video Elliott 'QuLogic' Sales de Andrade - Developer Luke 'LSchiere' Schierer - Support Megan 'Cae' Schneider - support/QA @@ -35,7 +37,6 @@ Crazy Patch Writers: ------------------- -Paul 'darkrain42' Aurich Marcus 'malu' Lundblad Dennis 'EvilDennisR' Ristuccia Peter 'Fmoo' Ruibal