pidgin: ad0be025: merge of '03e380d307e9063ff3938a7ccab180...

Fri Jun 26 00:50:38 EDT 2009

-----------------------------------------------------------------
Revision: ad0be02568add9e6c504793e433a8c44b8b4213f
Ancestor: 03e380d307e9063ff3938a7ccab18085899c6140
Ancestor: 5df439c3d330f7271440084acaa2c6f09701f781
Author: sulabh at soc.pidgin.im
Date: 2009-06-26T04:46:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ad0be02568add9e6c504793e433a8c44b8b4213f

Modified files:
        libpurple/network.h libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/history.c
        libpurple/protocols/msn/history.h
        libpurple/protocols/yahoo/yahoo_filexfer.c po/ca.po

ChangeLog: 

merge of '03e380d307e9063ff3938a7ccab18085899c6140'
     and '5df439c3d330f7271440084acaa2c6f09701f781'