pidgin: 22f55299: merge of '4dd6e06680aebbca6a326930f5fff7...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 22f552992fac5fe8d3bc8c5dc760a34568b51ead
Ancestor: 4dd6e06680aebbca6a326930f5fff7e65ed87802
Ancestor: 5dec4714953825272bec5164be3761db1d7fdc9a
Author: elb at pidgin.im
Date: 2008-06-05T22:40:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/22f552992fac5fe8d3bc8c5dc760a34568b51ead

Modified files:
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/si.c

ChangeLog: 

merge of '4dd6e06680aebbca6a326930f5fff7e65ed87802'
     and '5dec4714953825272bec5164be3761db1d7fdc9a'