Mercurial > pidgin.yaz
diff AUTHORS @ 26238:3e788c0db3a6
resolved conflict -- merged im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
---|---|
date | Wed, 12 Nov 2008 10:23:13 +0000 |
parents | de712dc6fecd |
children | d6c2d6c9fd2a |