Mercurial > pidgin
comparison doc/funniest_home_convos.txt @ 25980:d24b476cc60f
Fix merge (i.e. reapply my changes here).
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 07 Mar 2009 02:19:57 +0000 |
| parents | 09f4d4bca9b3 |
| children | ff365d26e997 |
comparison
equal
deleted
inserted
replaced
| 25979:439f07ce4c8a | 25980:d24b476cc60f |
|---|