pidgin: 32d4ce0b: merge of '518ebe34a3f1499bab1208e43f5e9a...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 32d4ce0b6cfc9ccb9a6e7ed661423b9260a0bead
Ancestor: 518ebe34a3f1499bab1208e43f5e9acf69c4ca3e
Ancestor: d092049f615e0cfd10ade1cb459e0827a01638fa
Author: qulogic at pidgin.im
Date: 2008-12-27T09:37:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/32d4ce0b6cfc9ccb9a6e7ed661423b9260a0bead

Modified files:
        ChangeLog 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 '518ebe34a3f1499bab1208e43f5e9acf69c4ca3e'
     and 'd092049f615e0cfd10ade1cb459e0827a01638fa'