pidgin: bdf4c8dd: merge of '8351342d3a30c75649de9c3d4abc7b...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: bdf4c8dd2356b5bd7b104d0c4c9d7264752d0132
Ancestor: 8351342d3a30c75649de9c3d4abc7b6f45ce8f82
Ancestor: 938f0bfb7e234aa40d9a86516142a372fa47ce40
Author: darkrain42 at pidgin.im
Date: 2009-08-01T18:55:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bdf4c8dd2356b5bd7b104d0c4c9d7264752d0132

Modified files:
        ChangeLog libpurple/certificate.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/zephyr/internal.h

ChangeLog: 

merge of '8351342d3a30c75649de9c3d4abc7b6f45ce8f82'
     and '938f0bfb7e234aa40d9a86516142a372fa47ce40'