pidgin: 4b37450c: merge of '18135201f43ac87c932feae03881d4...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 4b37450c5470f1f61cdba5cf5de7a6abb166b2c1
Ancestor: 18135201f43ac87c932feae03881d46e30d93030
Ancestor: 5e877772051b0cfb57b3eda07a70bb59562d0111
Author: maiku at pidgin.im
Date: 2009-08-27T05:58:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4b37450c5470f1f61cdba5cf5de7a6abb166b2c1

Modified files:
        ChangeLog libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/oscar/oscar.c pidgin/gtkblist.c
        pidgin/gtkmedia.c pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '18135201f43ac87c932feae03881d46e30d93030'
     and '5e877772051b0cfb57b3eda07a70bb59562d0111'