# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177646762 0
# Node ID 901dd46db6867ad175fb7105a0c096b5a3200d03
# Parent  973bc831cd0a41d1bb484cc6bd5150336f41f15f# Parent  e40d216f1368124173427fb4d0d8e18e259f79d3
merge of 'a6417c7aa009c9ca29dad662ec2127e07f871574'
     and 'cd3d48820c10f6499c2d95368a32c9caf431d527'

diff -r 973bc831cd0a -r 901dd46db686 doc/funniest_home_convos.txt
--- a/doc/funniest_home_convos.txt	Fri Apr 27 04:05:50 2007 +0000
+++ b/doc/funniest_home_convos.txt	Fri Apr 27 04:06:02 2007 +0000
@@ -451,3 +451,12 @@
 (07:54:03 PM) clueless21:  what's an im client?
 (07:54:25 PM) Nathan Walp: it lets you chat with other people, like we are chatting now
 (07:54:45 PM) clueless21:  oooooooooo... thanks
+
+23:58 -!- seanegan is now known as beta7
+23:58 <beta7> Hey, guys, remember me?
+23:59 <beta7> We were all supposed to be working on getting me out.
+23:59 <beta7> you guys remember that?
+23:59 -!- mode/#pidgin [+o elb] by ChanServ
+23:59 -!- beta7 was kicked from #pidgin by elb [getting feisty, are we?]
+23:59 -!- mode/#pidgin [-o elb] by ChanServ
+23:59 <marv> elb: good job getting beta7 out