pidgin: cc9474ca: merge of '319a1520a23092d6a84cf888dd3586...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: cc9474cafa24a034b6f09ddf020062a8de40e1e8
Ancestor: 319a1520a23092d6a84cf888dd358669dd7ba7c3
Ancestor: e692d9b569a972cd784a93d577784b7b96503ee2
Author: darkrain42 at pidgin.im
Date: 2009-10-06T03:34:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cc9474cafa24a034b6f09ddf020062a8de40e1e8

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

ChangeLog: 

merge of '319a1520a23092d6a84cf888dd358669dd7ba7c3'
     and 'e692d9b569a972cd784a93d577784b7b96503ee2'