Mercurial > pidgin
diff doc/funniest_home_convos.txt @ 25209:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | ef9da5db3c71 |
children | 09f4d4bca9b3 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | ef9da5db3c71 |
children | 09f4d4bca9b3 |