diff doc/funniest_home_convos.txt @ 27083:8671d9a37002

Fix merge error.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 08 Jun 2009 04:42:33 +0000
parents 09f4d4bca9b3
children ff365d26e997
line wrap: on
line diff