Mercurial > pidgin
diff PLUGIN_HOWTO @ 26154:618d122af044
resolving conflict - merging im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
| author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
|---|---|
| date | Wed, 12 Nov 2008 10:17:38 +0000 |
| parents | 83ec0b408926 |
| children | db5a58aabe38 |
