pidgin: 7d23f027: merge of '5d4c9f843c6735b316b8a1659cfdc4...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 7d23f027f9930d251c8b02cffe010c08b3fc906f
Ancestor: 5d4c9f843c6735b316b8a1659cfdc4d162aee4c0
Ancestor: a1515f71238597d861299c4a998b98967c1d6ef9
Author: evands at pidgin.im
Date: 2008-07-27T15:39:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7d23f027f9930d251c8b02cffe010c08b3fc906f

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

ChangeLog: 

merge of '5d4c9f843c6735b316b8a1659cfdc4d162aee4c0'
     and 'a1515f71238597d861299c4a998b98967c1d6ef9'