pidgin: fe5690f5: merge of '4c5a026e3419c03409089efe76548d...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: fe5690f538eb9373e340948a63c43511ec3ba199
Ancestor: 4c5a026e3419c03409089efe76548d6642ca1e2a
Ancestor: a1515f71238597d861299c4a998b98967c1d6ef9
Author: datallah at pidgin.im
Date: 2008-07-25T18:50:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fe5690f538eb9373e340948a63c43511ec3ba199

Modified files:
        libpurple/protocols/irc/irc.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of '4c5a026e3419c03409089efe76548d6642ca1e2a'
     and 'a1515f71238597d861299c4a998b98967c1d6ef9'