pidgin: 518ebe34: merge of '5043805100d2fa5a371317e802d6a1...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 518ebe34a3f1499bab1208e43f5e9acf69c4ca3e
Ancestor: 5043805100d2fa5a371317e802d6a191c89ddaeb
Ancestor: ad2c746d767233c843f194ae7d0063503ec50231
Author: qulogic at pidgin.im
Date: 2008-12-27T09:37:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/518ebe34a3f1499bab1208e43f5e9acf69c4ca3e

Modified files:
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/oim.c libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_network.c

ChangeLog: 

merge of '5043805100d2fa5a371317e802d6a191c89ddaeb'
     and 'ad2c746d767233c843f194ae7d0063503ec50231'