pidgin: 7d894195: merge of '1d9a1da300a6d07aa721ebc00ee40b...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 7d89419579202cb24dbc5088c757bd2df127b910
Ancestor: 1d9a1da300a6d07aa721ebc00ee40b928cdd790d
Ancestor: 2153f4107240dcbbf4ee52f56a5a310f1c9be4d9
Author: qulogic at pidgin.im
Date: 2008-11-23T21:57:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7d89419579202cb24dbc5088c757bd2df127b910

Modified files:
        libpurple/protocols/irc/cmds.c
        libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/switchboard.c

ChangeLog: 

merge of '1d9a1da300a6d07aa721ebc00ee40b928cdd790d'
     and '2153f4107240dcbbf4ee52f56a5a310f1c9be4d9'