comparison doc/funniest_home_convos.txt @ 16693:a0cae757170f

merge of '65f2c26feb0bf8de0c50edb97ab36ff815b40daa' and '7cab5e68b0e84a50800a767e4c5ea7316591b846'
author Tim Ringenbach <marv@pidgin.im>
date Wed, 25 Apr 2007 01:12:47 +0000
parents e331baecd661
children 9f0686d3d91b
comparison
equal deleted inserted replaced
16687:07b5cf0a46e2 16693:a0cae757170f