pidgin: abd58e08: merge of '49bc9af35492c4f9b66f7233c77ec1...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: abd58e080488d437ecaee1209172d094986d2ad5
Ancestor: 49bc9af35492c4f9b66f7233c77ec192432a00f0
Ancestor: 70ee1de1cc79688256a3dd6ac1a519e24c00a12c
Author: darkrain42 at pidgin.im
Date: 2009-05-11T22:05:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/abd58e080488d437ecaee1209172d094986d2ad5

Modified files:
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/qq_crypt.c

ChangeLog: 

merge of '49bc9af35492c4f9b66f7233c77ec192432a00f0'
     and '70ee1de1cc79688256a3dd6ac1a519e24c00a12c'