Mercurial > pidgin.yaz
diff doc/funniest_home_convos.txt @ 27053:58ff88dba33a
Fix merge.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Wed, 29 Apr 2009 23:23:51 +0000 |
parents | 09f4d4bca9b3 |
children | ff365d26e997 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Wed, 29 Apr 2009 23:23:51 +0000 |
parents | 09f4d4bca9b3 |
children | ff365d26e997 |