comparison doc/gaims_funniest_home_convos.txt @ 15439:a415922e2882

merge of '8f5c72b9dbcf628f35e4674469f97b34f9c6fa2c' and 'e082ba7b9cfaf0fef0531d0fe9b54af7831f75df'
author Ethan Blanton <elb@pidgin.im>
date Sun, 28 Jan 2007 01:24:15 +0000
parents bba7a2aa2e12
children 7ea06c408a0d
comparison
equal deleted inserted replaced
15426:c9497aad9fc4 15439:a415922e2882