Mercurial > pidgin.yaz
diff ChangeLog @ 20413:fd7b501cc9c8
fix up broken merge
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sat, 12 May 2007 19:35:18 +0000 |
parents | 34f698ffe88b |
children | e5bed026ccd2 |
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sat, 12 May 2007 19:35:18 +0000 |
parents | 34f698ffe88b |
children | e5bed026ccd2 |