Mercurial > pidgin.yaz
diff pidgin/gtkcertmgr.c @ 26236: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 | 8233bbcf3e86 |
children | aaaff38e144f 73c8e1964eef |