pidgin: fdf3ae93: merge of '0696d14c26cfe65de7a3f68a2b9d14...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: fdf3ae9383614c0dc53e1d9b17637e50e0819acb
Ancestor: 0696d14c26cfe65de7a3f68a2b9d14b283f88e1f
Ancestor: 256d39c0fd5169819199dd5a2586b6b2b144280c
Author: darkrain42 at pidgin.im
Date: 2009-08-22T05:38:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fdf3ae9383614c0dc53e1d9b17637e50e0819acb

Modified files:
        configure.ac libpurple/certificate.c
        libpurple/protocols/jabber/jingle/rtp.c
        pidgin/plugins/Makefile.am

ChangeLog: 

merge of '0696d14c26cfe65de7a3f68a2b9d14b283f88e1f'
     and '256d39c0fd5169819199dd5a2586b6b2b144280c'