# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1188235336 0
# Node ID 217c4b1d3a09a0d2129d161c68c6a8235956baee
# Parent  286438542b24e76dc9abedfd7ee35a8e7c19dde3# Parent  fb69c4dd757e8cb23fd68cd2caf670696c6ff267
merge of 'b6c53eca73f8f22b0d8fafd412b2570c631455be'
     and 'db850ab42d8f30eaba15fafaa3dc5ec1137141e7'

diff -r fb69c4dd757e -r 217c4b1d3a09 doc/funniest_home_convos.txt
--- a/doc/funniest_home_convos.txt	Mon Aug 27 17:17:04 2007 +0000
+++ b/doc/funniest_home_convos.txt	Mon Aug 27 17:22:16 2007 +0000
@@ -474,3 +474,16 @@
 
 19:23 <-- elb has quit (K-lined)
 
+19:01 <user> whoa
+19:01 <user> okay
+19:01 <user> now when i try to go into the left over files after the 
+             uninstall
+19:01 <user> something is seriously wrong because it says "the files on the 
+             c drive are not formatted, would you like to format?"
+19:03 <user> manually deleting the folder from command gives me a "Data 
+             error (cyclic redundancy check)."
+19:03 <elb> remember, one line per thought
+19:03 <elb> and yes, you have something wrong with your computer, we've 
+            established that
+19:03 <user> its functioning just fine
+
diff -r fb69c4dd757e -r 217c4b1d3a09 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Mon Aug 27 17:17:04 2007 +0000
+++ b/pidgin/gtkdialogs.c	Mon Aug 27 17:22:16 2007 +0000
@@ -96,6 +96,7 @@
 static struct developer patch_writers[] = {
 	{"John 'rekkanoryo' Bailey",	NULL,	NULL},
 	{"Peter 'Bleeter' Lawler",      NULL,   NULL},
+        {"Dennis 'EvilDennisR' Ristuccia",	N_("Senior Contributor/QA"),	NULL},
 	{NULL, NULL, NULL}
 };