diff libpurple/cmds.c @ 26156: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 b5f679e95666
children a6e3cb32cdd2
line wrap: on
line diff