diff AUTHORS @ 25370:b3015da48886

merge of 'a2f94e06ea53c95077731e0833699222e6050fd0' and 'b20c44775e2aa1c5bc5e36f7f94adafc5c67b3fd'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 25 Jan 2009 20:51:41 +0000
parents 681e58ea3a9b
children 6c3c8e2c5f4f
line wrap: on
line diff
--- a/AUTHORS	Sun Jan 25 09:13:28 2009 +0000
+++ b/AUTHORS	Sun Jan 25 20:51:41 2009 +0000
@@ -36,7 +36,6 @@
 Crazy Patch Writers:
 -------------------
 Paul Aurich
-Felipe 'shx' Contreras
 Marcus 'malu' Lundblad
 Dennis 'EvilDennisR' Ristuccia
 Peter 'Fmoo' Ruibal
@@ -57,6 +56,7 @@
 
 Retired Crazy Patch Writers:
 ---------------------------
+Felipe 'shx' Contreras
 Decklin Foster
 Peter 'Bleeter' Lawler
 Robert 'Robot101' McQueen