pidgin: dc9a1245: merge of '071f90416f664b41b4426e7929dc0a...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: dc9a1245c614372c3eb72de56c563cc1453c8802
Ancestor: 071f90416f664b41b4426e7929dc0a595aa02127
Ancestor: cc9474cafa24a034b6f09ddf020062a8de40e1e8
Author: sadrul at pidgin.im
Date: 2009-10-06T15:58:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dc9a1245c614372c3eb72de56c563cc1453c8802

Added files:
        share/ca-certs/Entrust.net_Secure_Server_CA.pem
Modified files:
        ChangeLog libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/yahoo/util.c
        libpurple/tests/test_yahoo_util.c
        pidgin/win32/nsis/pidgin-installer.nsi po/de.po
        share/ca-certs/Makefile.am

ChangeLog: 

merge of '071f90416f664b41b4426e7929dc0a595aa02127'
     and 'cc9474cafa24a034b6f09ddf020062a8de40e1e8'