pidgin: b226157c: merge of '2397ba22512c2bb9c2e3d67b9b0e38...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: b226157ce4114ddbcb551baf27ab48f1b73bcf84
Ancestor: 2397ba22512c2bb9c2e3d67b9b0e38ced723db05
Ancestor: e79c3708cf80d30995721ca847ef81d4542dfc69
Author: darkrain42 at pidgin.im
Date: 2010-04-19T16:05:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b226157ce4114ddbcb551baf27ab48f1b73bcf84

Modified files:
        doc/connection-signals.dox finch/gntblist.c
        libpurple/connection.c libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth_scram.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/switchboard.c pidgin/gtkblist.c
        pidgin/plugins/ticker/gtkticker.c

ChangeLog: 

merge of '2397ba22512c2bb9c2e3d67b9b0e38ced723db05'
     and 'e79c3708cf80d30995721ca847ef81d4542dfc69'