im.pidgin.pidgin: a3b0a4bc8d84102e8fd94d00e19e2919a1dfa2b3

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: a3b0a4bc8d84102e8fd94d00e19e2919a1dfa2b3
Ancestor: 3dc120bb73d0a2d3ce3f6339e0882bd0321e24c8
Ancestor: ec4fc775c7d333800b4229a7484b2f6f61c7c1a1
Author: sadrul at pidgin.im
Date: 2008-01-12T03:24:35
Branch: im.pidgin.pidgin

Modified files:
        COPYRIGHT ChangeLog libpurple/protocols/oscar/oscar.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/simple/simple.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_filexfer.h
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.h libpurple/util.c
        po/en_GB.po

ChangeLog: 

merge of '3dc120bb73d0a2d3ce3f6339e0882bd0321e24c8'
     and 'ec4fc775c7d333800b4229a7484b2f6f61c7c1a1'