Mercurial > pidgin
comparison doc/funniest_home_convos.txt @ 29275:23f07a817807
Manual merge
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 02 Mar 2009 21:52:16 +0000 |
| parents | ef9da5db3c71 |
| children | 09f4d4bca9b3 |
comparison
equal
deleted
inserted
replaced
| 29274:e0e0cecdcd16 | 29275:23f07a817807 |
|---|